merge from open-source master

Merge commit 'goog/stage-korg-master' into HEAD
tree: 4d467c169708caa4085b8b5f760ecee3c8976fff
  1. dictionaries/
  2. dictionary/
  3. res/
  4. src/
  5. Android.mk
  6. AndroidManifest.xml