Merge "Convert Android.mk file to Android.bp" am: da44f9cf37
am: 56c2c6c8ca

Change-Id: Ifc35d5117be9b9bfbb9c802baf240729ecb88bbc
tree: 706a65610cc67612d3d58758505d5274d5b1899f
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. NOTICE