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

Change-Id: I82b753f8b48702989e957d6a23ed2413cd5a1b0c