Merge "Renaming in filter-intra sse4 code" into nextgenv2