[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 713bdaf20e -s ours
am skip reason: change_id Ib0cf39703ffcf1708a59ddea0def3ce127baa154 with SHA1 cdc17eef28 is in history

Change-Id: I394a359cbeb488b5d7252924b1495d3d48211018
tree: 28d8b17d91c8ea7c566562d09081ff3b007273ed
  1. common/
  2. darwin-x86/
  3. linux-x86/
  4. path/
  5. build-prebuilts.sh
  6. manifest.xml
  7. OWNERS