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

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