android build fixes
Merge branch 'master' of https://github.com/JDaance/moai-dev