Merge "vp9_bitstream.c resolve warnings in vs"