Merge "Remove unused android-specific defines"