DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: Iafc34cc18382564c6b0fca1d930d137776674eb1
tree: 4cfc5307cbc861f4a8a16ac42d01c5a18777eb76
  1. android/
  2. dist/
  3. Android.bp
  4. CleanSpec.mk
  5. OWNERS
  6. README.version