Merge "android.mime.types: minor cleanup."
am: 14ee0b7d5c

Change-Id: I2a28826772637d5893c83f5a73afe7b16465aec6