CB-3480: update now uses cordova.js not cordova-<ver>.js
CB-3496: Fixed streaming audio, this is pretty important for mobile spec
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android
Merge branch '2.8.x' of https://git-wip-us.apache.org/repos/asf/cordova-android into 2.8.x
Merge branch '2.8.x' of https://git-wip-us.apache.org/repos/asf/cordova-android into 2.8.x