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