merge from open-source master

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