Merge pull request #1732 from Sonicadvance1/stupid_android_garbage Work around broken Android garbage.
