[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master.
am: 01d7606ec4 -s ours
am skip reason: subject contains skip directive

Change-Id: I34465ce93ea21c9fb7af89279e55f9a022a2ba7e
tree: 8bdeeb67b28ede8b65dca6d672024b9ee9e61925
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. res/
  5. src/