Merge "android.mime.types: minor cleanup."