[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 1e1d3c8725 -s ours am: d545844400 am: c7a33bf6f4
am: cf52221ba4 -s ours
am skip reason: subject contains skip directive

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