[automerger skipped] DO NOT MERGE am: aaa1e4d6fe  -s ours am: 98ae28ecf2  -s ours
am: 75facec7bd  -s ours

Change-Id: Ia4b3a87f8eb0891d27b4b104b051d85a84693ae4
tree: 01bd432e31d7cf56674aa9b4f2b00ed315386305
  1. darwin-x86/
  2. linux-x86/
  3. manifest.xml