android: make compatible w/ proposed cordova-android changes