Merge "Minimize default MIME map and optimize loading." am: d1bafa9ce1 am: 20615e9565
am: 72cb153d30

Change-Id: Ic81200bcb7d1f75ec84bcd188581f4c487c6b167