Fixing Android build issues.