Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

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