Merge "Fix test execution on hwasan builds"