Merge "vpx_codec_internal.h : clean out unused function warning"