am fb8b02eb: am 073d6225: Reconcile with jb-mr1-factory-release - do not merge

* commit 'fb8b02ebb853aefb911690d6dd5e89ad68fa905d':
tree: 50d24b67ee771ac64ca2bb3779586b802e96b34f
  1. conf/
  2. include/
  3. src/
  4. Android.mk
  5. vnd_buildcfg.mk