Merge e45d5d87e1cca4ad09f6b8e47083f459b70a0b7a on remote branch

Change-Id: Id34a3d571405307a109f967561818492df1f0840
tree: c0e556fd779a75662d80e766a46470955dca3503
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml