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

Change-Id: I8dc3c706d6f36d100a1c9bf0f73d6332e3f92bce