Merge "Convert Android.mk file to Android.bp" am: 069ba8677d
am: 4b155f3f12

Change-Id: I056fd7a439cea1d80294686b5aa862b106ccadeb
tree: 9f37287817f976950a818ee47e4ae81ec287fa34
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml