am 759a6a05: Merge "Replace usages of Unsafe.compareAndSwap(Int|Long)"

* commit '759a6a05c7c32e9f8a1def0bf463044b89e5ce4e':
  Replace usages of Unsafe.compareAndSwap(Int|Long)