Merge "MimeMapTest: Re-enable assertion that now passes." am: 02b7700529
am: a64f5b9729

Change-Id: Ic9c01d9e914d262bcef5da6543340dc24011790c