Merge f330465fb548deb5333eddefd23a8e596b358401 on remote branch

Change-Id: I43947e48a9b1f505fe5816d51c5a04feea902724
tree: 337dd1bfd051fdf8806f22aad0b4e3e2f90c9bf5
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. build.gradle