merge from open-source master

Merge commit 'goog/stage-korg-master' into HEAD
tree: 7aea7b559099a4f01a121e2d53a438fdaccf4168
  1. android/
  2. dist/