Upleveled 3.3.x from cordova-android

Got commits from cordova-android to uplevel amazon-fireos for 3.3.x branch.