Merge commit '1d7d21a48104e1328e3432ce8c562377a72b1e5c' into HEAD

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