Merge "convolve_test: Avoid #if inside INSTANTIATE_TEST_CASE_P" into nextgenv2