fix build scripts so we don't always recompile everything
fix android build scripts
Merge remote-tracking branch 'origin/feature-20140804-fix-android-scripts' into feature-20140804-settings-fix

Conflicts:
	libs/op-core-cpp
	libs/op-stack-cpp