[automerger skipped] Merge "Convert more of frameworks/base/packages to Android.bp" am: 25fff4828a -s ours am: 122f77dbac -s ours
am: 649965cdc5 -s ours
am skip reason: change_id I851b819030a1da6091f5d6125a228bb01a99011b with SHA1 20bc2bf3f6 is in history

Change-Id: Id47bb7c3b015b0165596864217aabc76de3195de
tree: fe8447b98cb091e82bc42fce8703423210644a19
  1. perf_tests/
  2. res/
  3. src/
  4. tests/
  5. Android.bp
  6. AndroidManifest.xml
  7. proguard.flags