Switch to using cordova-android 4.0.x branch
Fix cordova_plugins.js not being used on Android & restrict plugins on native side to only those that should be loaded.
Merge branch 'upstream' (selective plugin loading)

Conflicts:
	AppHarnessUI/AppHarnessUI.java
	createproject.sh
	www/cdvah/harnessmenu.html
	www/cdvah/js/AppsService.js
Renaming cordova_plugins.js caused a race condition. Fix it by editing cordova.js
Merge branch 'upstream' (fix race condition with cordova_plugins.js)