Make work with the latest changes to android-4.0.x
Fix wrong path in createproject.sh (failed every time)
Merge branch 'upstream' (android-4.0.x changes)

Conflicts:
	AppHarnessUI/android/AppHarnessUI.java
	AppHarnessUI/plugin.xml