merge from open-source master

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