[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 5b11cb42cf  -s ours
am: 1d8a4ba833  -s ours

Change-Id: If5eaf8706c9ebd31f9aa27ed73d8b00ddeba2de4
tree: effe167cf96876bee8a312caf06f418807322f05
  1. darwin-x86/
  2. linux-x86/
  3. build-prebuilts.sh
  4. manifest.xml