Merge "vpx_dsp/bitwriter.h: vp9_->vpx_"