Merge "Convert Android.mk file to Android.bp" am: a2b4a33c84
am: d6809cd4d2

Change-Id: Ia4a2ee27d73b013aed813ead860afe8309525dee
tree: 66b1e4771c72c67e633ca0910e9f6ffcf24be262
  1. assets/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml