Merge "bionic_atomic_arm.h: Remove < ARMv6 support"