Merge pull request #422 from negativeExponent/fix_android_build