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