Minor bugfixes in Android SDK setup script