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

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