am b387ce8a: Remove references to android_atomic_swap.

* commit 'b387ce8ae1ffa0861be1ec94ba6c313203931a1b':
  Remove references to android_atomic_swap.