Merge "Fix vp10 txfm on MSVC 2015." into nextgenv2