Merge "Fix assertion fail in build_intra_predictors" into nextgenv2