am d60d67db: am aeec2ae7: Merge "Remove the broken pthread deadlock prediction."

* commit 'd60d67db33a7190504c1503455a4e49f7f01a9db':
  Remove the broken pthread deadlock prediction.