Merge N-MR1 to remote branch.

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