Fix Android build, missing input stuff
Merge branch 'master' into audio

Conflicts:
	engine/os/android/AndroidDevice.cpp
fix SLESRenderer