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

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