Merge "vp9_loopfilter.c: cosmetics"