[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: b9bbab4ce2 -s ours
am skip reason: subject contains skip directive

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