Merge "Merge Android Pie into master"
am: a4319c3d6f

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