Remove unused parts of AndroidCompatibility
Merge pull request #2692 from danzel/tidy-android-compatibility

Remove unused parts of AndroidCompatibility