Merge "Convert Android.mk file to Android.bp" am: 7c18b9609f
am: 10d953e9e6

Change-Id: I150cf4741128ab06e672f02207618946aaebd7cd
tree: 83579290c12daedf586c30539c218042338c4a07
  1. art/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml