Android build fix
Merge branch 'master' of https://github.com/TheJosh/chaotic-rage