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

Change-Id: I190510ea05a6a11fc9c59088f5b53f2f900f2b0a
tree: 6b895cb6b33e48049fb024c605bc099336674e92
  1. arm/
  2. arm64/
  3. common/
  4. x86/
  5. x86_64/
  6. Android.bp