Merge "Track MimeMap moving to libcore.content.type." am: 0801b7c222
am: 093c1e4eaa

Change-Id: If2b46820dc9ba3d8ba6b8f542521f3818b0074c9