[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 367167e081 -s ours
am: 104801bbfa -s ours
am skip reason: change_id I4d381d4cd3be0c07b80afd00af3e46a34aa5fc89 with SHA1 379286bc6d is in history

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