Merge "API council review for libcore.content.type.MimeMap"