Merge "mime.types.README: Clarify upstream version." am: e5e053826a
am: 9fd803a31e

Change-Id: If2307edefbf472e8f4f5a62cbc2e3deb47517b58