[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: f8628dbd10 -s ours am: 03301abf2c am: 06f19102e2 am: dc26b6070b -s ours

am skip reason: subject contains skip directive

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