Merge "Correctly handle EINTR return from futex"