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

Change-Id: Ib18214d3bd9a295a792025cae58102ebf187b0bf