Fixed android build
Merge branch 'develop' of https://github.com/Team-Innis/UtH-Engine into develop