Fixed NACL build
Merge branch 'master' of https://github.com/JoakimBlomberg/moai-dev