Merge "HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined." am: 187db58e0e
am: ce64f48faf

* commit 'ce64f48faf7aa5250a5b8604116f5f52c8459327':
  HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE is never defined.

Change-Id: I393af6784dfc706ee186fb7a0dd7c40b9ce649d8