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

Change-Id: Iddafb3408e5caaf47dd2eb2df8d71807f417da84