Merge "Split up the system/core/ TEST_MAPPING."