Merge "Tiny vp9_picklpf.c cleanup."