Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: d580e4b740

Change-Id: I101cd2e26629be1027f68b6c75a694f619f2fce6
tree: 9ba9c1eea340c1b0e0327b056928499dc72f49a6
  1. conf/
  2. include/
  3. src/
  4. Android.mk
  5. gen-buildcfg.sh
  6. OWNERS
  7. vnd_buildcfg.mk