Reconcile with jb-mr1-release - do not merge

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