Merge pull request #187 from Sonicadvance1/android-clang-fix Fix the Android build when using clang 3.4
