[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: d73843847d -s ours
am skip reason: subject contains skip directive

Change-Id: I1a052350f5514a602d07c8167b9f0a7041f1e629
tree: c42a90aacfe1c07af564ada7ea03e559767ab543
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. proguard.flags