Merge "Customizable MIME type <-> file extension mapping, step 2." am: adba73feb9
am: 116957519e

Change-Id: I7bb25da97363097ec5f06debf419b4ae8f1fc66f