Merge "Add check for pthread_self() when looking up a thread"
am: b90837c3d3

* commit 'b90837c3d316c6ea8d6f0b0b6a3643d0d3245a0e':
  Add check for pthread_self() when looking up a thread