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

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