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

Change-Id: I2778201bf788ba8da736fd0a5a896467fcafcfb3
tree: 5d2c09bc8d521dad0993a5cf6b264eb7eb49a7ad
  1. darwin-x86/
  2. linux-x86/
  3. build-prebuilts.sh
  4. manifest.xml