Merge "Fix file permissions and include path" am: 745cea96a0
am: 2dfc5e926f

Change-Id: Ic63e57d622088f48db9d3942ffdd5488a6f5ecbd
tree: 68c651ad62c9998d05bd44ec2f8bc0f73020e860
  1. conf/
  2. include/
  3. src/
  4. Android.mk
  5. gen-buildcfg.sh
  6. vnd_buildcfg.mk