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

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