Merge "Make atomics use for allocator counters consistent."