Merge "Properly detect timeout in pthread_mutex_lock_timeout_np_impl"