Sierra now supports clock_gettime(), so fix some code that assumed mach and HAVE_CLOCK_GETTIME where mutually exclusive.