Merge "Revert "Add TEST_MAPPING for aac project""