merge from open-source master

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