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

Change-Id: I13997bf4f330d2ceb2d871b291729b4d78569ba2