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

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