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

Change-Id: I129f82b841d69ab81d6e863a86b4df47582d3819