Switch to new Travis Android support.
Modify and merge #10.