Merge pull request #9835 from JosJuice/android-hardcoded-strings Android: Clean up some hardcoded strings
