Reconcile with jb-mr1-release - do not merge

Change-Id: I91685494ac99ec33117c8643bb303975b10add89
tree: e1518c68deaa1f24c30006c6816fbbab57536800
  1. res/
  2. sample/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml