Merge "Remove vendor_firmware_file type"