cherry-pick a bunch of fixes, including Android support
Source for buildrump.sh git rev 275bc4352acfb662b53d3a5c852036555b2c3f9b