Merge "Track MimeMap moving to libcore.content.type."