Merge "Reimplement clock(3) using clock_gettime(3)"