Merge "Remove android_... store_barriers and 64-bit atomics."