Merge remote-tracking branch 'goog/jb-ub-mail-ur9' into merge

Merge UR8 into MR2.

Change-Id: I543d9284ef7eb1efcc1ec568a9660d03c4cbf32a
tree: 50173d8022e626aa90b16c17c8f4ef9bc6d17e11
  1. res/
  2. sample/
  3. src/
  4. .gitignore
  5. Android.mk
  6. AndroidManifest.xml