Merge "vp9_convole.c cleanup."