Merge "Add a quick path in build_intra_predictors" into nextgenv2