merge from open-source master

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