am f491f497: Merge "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""

* commit 'f491f497b2a4ba5a0ec60b291cce4ffb3be3d33c':
  Revert "Revert "Revert "Remove incorrect android_atomic_...64 use."""