Merge N-MR1 to remote branch.

Change-Id: I77a4ce17c9c85189c03a36e6d34e1a4abf71220a
tree: 8e2c37e998256a095f823c80971a1c86f175941a
  1. assets/
  2. icons/
  3. res/
  4. src/
  5. TestCommon/
  6. tests/
  7. AndroidManifest.xml
  8. build.gradle