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

Change-Id: I4c490ef4d61177af5f01ab56f170acc56d29a259