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

Change-Id: Id611bb49a234a70238b1e505c884ef6616554d14