fix compiling for JVET_AA0058_GPM_ADP_BLD

6 jobs for !299 with ECM6_TM_OFF in 20 minutes and 6 seconds (queued for 2 seconds)
latest merge request