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

Change-Id: I707f1299a1846e9f3f6ad5ba7cb0231428424c16