Merge "vp8cx.h: vpx/vpx_encoder.h -> ./vpx_encoder.h"