Merge "Revert^4 "Implement LockSupport.park with a futex""