Merge "Fix build: align pthread_cond_t to sizeof(long)"