Fix merge of libc/private/bionic_atomic_arm.h