am 6e5316b1: Merge "Revert "Revert "Remove incorrect android_atomic_...64 use."""

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