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

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