Merge "test_intra_pred_speed fix: use dspr2 version when HAVE_DSPR2" into nextgenv2