Merge "android.mime.types: Allow one-way mime -> ext only override." am: 9b08d3b3ba
am: 94f9f69e22

Change-Id: I75cf91cc8492bdc9af71747f1b7dd36976d30187