Merge "TEST_MAPPING += VINTF tests" into main