Merge "vendor.mime.types: Revert accidental modification." am: b6a549d916
am: f73856beb1

Change-Id: Iaea6512c608709e91832654374297194dacae4af