Merge "Customizable MIME type <-> file extension mapping, step 1."
am: b152621257

Change-Id: Ied0adb311cfc201e7b6259e9105752a75ee37f1c