Merge "Add TEST_MAPPING for atrace"