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

Change-Id: I9597b98609f4af25c4c69eaf9d95590a7554a168