Merge "tweak TEST_MAPPING for libcore.content.type"