Merge "fdct4x4_test: fix unsigned overflow" into nextgenv2