Merge pull request #322 from retro-wertz/fix_android_build