am e94bd6de: Fix a problem exposed by r208825, which caused bind (and other bits of libc++) to stop working. And tests

* commit 'e94bd6de63a31e034e2ed05aa4a9a1c5a1208482':
  Fix a problem exposed by r208825, which caused bind (and other bits of libc++) to stop working. And tests