Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 55dc568578

Change-Id: If27b2f944e474ea0d1ab6b238fbaabb5e6e5b689
tree: 3b102567981ab07a3e25a39229a7a835f5e3972d
  1. android/
  2. dist/
  3. Android.bp
  4. CleanSpec.mk
  5. OWNERS
  6. README.version