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

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