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

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