Small fixes

Small fixes to the android build script.