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

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