Merge "Using vpx_codec_err_t instead of int."