Merge "Fix test VP8/9 encoder CTS failure" into main