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