Upleveled master from cordova-android

Pulled more commits from cordova-android.