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

Change-Id: Ibdbc56df7bc1de1f2871a39d03398d42f790d703
tree: e6f2eb3a71adf37bfb0e272764ea99de556cc0ee
  1. darwin-x86/
  2. linux-x86/
  3. manifest.xml