am fae42a83: Merge "Revert "Revert "Lose the hand-written futex assembler."""

* commit 'fae42a837ae7f880de9561c7b3c2b18e4a531e90':
  Revert "Revert "Lose the hand-written futex assembler.""