Merge "Customizable MIME type <-> file extension mapping, step 3 (attempt #2)." am: 287d9b5a37
am: c8fbf4ca68

Change-Id: I33db15b141063a3469f0ac6d10de4a24779d1508