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

Change-Id: I9f9edc9c7f1ebbb4ab4c70d3570f240ec7a7efc5
tree: 8a86f582612965cd4cbc466a435ab5a12a43037f
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle