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

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