am 6f22f6ba: am e1034238: am b387ce8a: Remove references to android_atomic_swap.

* commit '6f22f6bac408e487bcf8fcfd25ef6263cfaefd57':
  Remove references to android_atomic_swap.