merge from open-source master

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