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

Change-Id: I63889b3eedb8f98c99d71172dc5cc32025a8afd4