Reconcile with jb-mr1-factory-release - do not merge

Change-Id: I470d1b8e5f8bc1766187486d2ea8950ed45431c6
tree: 50d24b67ee771ac64ca2bb3779586b802e96b34f
  1. Android.mk
  2. conf/
  3. include/
  4. src/
  5. vnd_buildcfg.mk