Merge "Remove unused private variables from vp10_inv_txfm2d_test.cc" into nextgenv2