Merge "libcutils: Reflect the naming change, __ARM_HAVE_LDREX_STREX, in bionic"