Merge "Fix a rdcost computation issue in sub8x8 block mode search" into nextgenv2