NXP-11063: Don't use diamond operator as it is not supported in -source 1.6