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

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