Merge pull request #188 from Sonicadvance1/clang-warnings Fixes warnings that Clang 3.4 exposes on Android.
