Merge "General cleanup inside vp9_bitstream.c." into experimental