Merge "Fix pthread_getcpuclockid." into klp-dev