Integrate missing adaptation of JVET-AJ0061 (TIMD-merge) with JVET-AJ0096 (SATD reordering)
This fix adapts template cost calculation of JVET-AJ0061 (TIMD-merge) with the modification proposed by JVET-AJ0096 (SATD reordering).
Note that another fix is also included, which is related to conflicting declaration of generateDimdBlending() function between JVET-AJ0061 and JVET-AJ0267. However, submitted !763 (merged) seems to have already addressed this. So, the merger might ignore the second aspect on top of !763 (merged) (once merged).