Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 5563982c93
am: 79b11a62a4

Change-Id: Iace16fa78ede269c2e7dc3d1a89aeb4518074e60
tree: 7f1a2853cc94de56218c4401d7a5f547d959f167
  1. darwin-x86/
  2. linux-x86/
  3. build-prebuilts.sh
  4. manifest.xml