Merge "Remove redundant code from vp10_fwd_txfm2d.c" into nextgenv2