merge from open-source master
tree: b1c0765d5145250a46523190f7375b3f3ed6effc
  1. android/
  2. dist/