Merge "test_intra_pred_speed.cc : Fix visual studio build." into nextgenv2