JVET-AH0314 EE2-3.5d: Combination of EE2-3.4 (JVET-AH0073) and EE2-3.5c (JVET-AH0186)
Lossless code cleanup for Test 3.5d (that is Test 3.4 + 3.5c) and rename macros (JVET_AH0314_ADAPTIVE_GPM_BLENDING_IMPROV for Test 3.4; JVET_AH0314_LIC_INHERITANCE_FOR_MRG for Test 3.5c).