Merge "Correct value_type for some TrackingAllocators."