[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: df9a7ab05a -s ours am: 9cc49c4661 -s ours
am: 485a31132e -s ours
am skip reason: change_id I29b3e3131804fcbc215e0adcbc5dc9cc0a77d220 with SHA1 0b0a9471f7 is in history

Change-Id: I2a67ad215c0d527817d51842a7bb860f0ca8a2c0
tree: 83471e5f6424f9a88c0609c8ca62445ce7ee5f0e
  1. include/
  2. src/
  3. Android.mk
  4. gen-buildcfg.sh
  5. OWNERS
  6. vnd_buildcfg.mk