Merge "Revert "Customizable MIME type <-> file extension mapping, step 3.""
am: 0e9ea2bcbf

Change-Id: I6ef357c98ab027ebea792aac4a215a3ad7773394