Merge "Cleaning up vp9_cx_iface.c."