Merge "vp9_onyx_int.h resolve visual studio warning errors"