Merge "Split TEST_MAPPING for resolv/ to its own directory"