merge from open-source master

Merge commit 'goog/stage-korg-master' into HEAD
tree: 3cc16ec32647272557eea0fe254bcc0227d7e2de
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE