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

Change-Id: Iefe597a7413c013aa2971d9b500057738dfa56c8