Merge commit \'fddca689914c81a46b3bb9384c5d467ad4c09203\' into HEAD
am: 7bb20397a3

* commit '7bb20397a32bb2800b6b9ede8ad0809f0b824df7':
tree: 02822a92380a69180b3ae377aa0835d6a86e596d
  1. conf/
  2. include/
  3. src/
  4. Android.mk
  5. gen-buildcfg.sh
  6. vnd_buildcfg.mk