[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: d8873bc20d
am: 060c8382e4 -s ours
am skip reason: subject contains skip directive

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