Android
Refactor setup scripts a little.