Merge "Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use."""""