Merge "Clean up cc_test TEST_MAPPING after default update"