Merge "Fix pthread_cond_clockwait() when cond is initialized with CLOCK_MONOTONIC" am: 09ecb00b86 am: 50940c55d2
am: 2aca38c5a8

Change-Id: I464efe927e958b9e99cafead6c166b7e352ac7fe