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

Change-Id: I5eb0bd3cf5fd50d180c8da61a375f3faa0737164