Merge "Cleaning up vp9_onyx_if.c and vp9_onyx_int.h."

diff --cc vp9/encoder/vp9_onyx_if.c
Simple merge

diff --cc vp9/encoder/vp9_onyx_int.h
Simple merge

diff --cc vp9/vp9_cx_iface.c
Simple merge