Merge "Make CTS more opinionated about the platform's default MimeMap."
am: a8bfed9104

Change-Id: I875861a7813886c3d78862fa19e6fc53d111c0f9