Merge "Fix `pthread_cond_timedwait()` error processing in dex2oat." am: dadba138d7
am: 5fc9dc61eb

Change-Id: Idfe851a9b0c213315f48092fff97423edb33018f