Merge "Make CTS more opinionated about the platform's default MimeMap." am: a8bfed91 am: ac8a5625 am: 7e2ac2ea Change-Id: I4c490ef4d61177af5f01ab56f170acc56d29a259