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

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