Merge "Removing unused code from vp9_onyx_if.c."