Merge 2nd GDT 6.6.0 patch (#3563)

Author: paulb777

GoogleDataTransport.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'GoogleDataTransport'
-  s.version          = '1.1.0'
+  s.version          = '1.1.1'
   s.summary          = 'Google iOS SDK data transport.'
 
   s.description      = <<-DESC

GoogleDataTransport/GDTLibrary/GDTStorage.m

@@ -258,12 +258,11 @@ - (void)encodeWithCoder:(NSCoder *)aCoder {
     NSMutableDictionary<NSNumber *, NSMutableSet<GDTStoredEvent *> *> *targetToEventSet =
         sharedInstance->_targetToEventSet;
     if (targetToEventSet) {
-      [aCoder encodeObject:sharedInstance->_targetToEventSet forKey:kGDTStorageTargetToEventSetKey];
+      [aCoder encodeObject:targetToEventSet forKey:kGDTStorageTargetToEventSetKey];
     }
     GDTUploadCoordinator *uploadCoordinator = sharedInstance->_uploadCoordinator;
     if (uploadCoordinator) {
-      [aCoder encodeObject:sharedInstance->_uploadCoordinator
-                    forKey:kGDTStorageUploadCoordinatorKey];
+      [aCoder encodeObject:uploadCoordinator forKey:kGDTStorageUploadCoordinatorKey];
     }
   });
 }

GoogleDataTransport/GDTLibrary/GDTUploadCoordinator.m

@@ -208,11 +208,10 @@ - (void)appWillTerminate:(GDTApplication *)application {
 #pragma mark - GDTUploadPackageProtocol
 
 - (void)packageDelivered:(GDTUploadPackage *)package successful:(BOOL)successful {
-  dispatch_queue_t coordinationQueue = _coordinationQueue;
   if (!_coordinationQueue) {
     return;
   }
-  dispatch_async(coordinationQueue, ^{
+  dispatch_async(_coordinationQueue, ^{
     NSNumber *targetNumber = @(package.target);
     NSMutableDictionary<NSNumber *, GDTUploadPackage *> *targetToInFlightPackages =
         self->_targetToInFlightPackages;
@@ -235,11 +234,10 @@ - (void)packageDelivered:(GDTUploadPackage *)package successful:(BOOL)successful
 }
 
 - (void)packageExpired:(GDTUploadPackage *)package {
-  dispatch_queue_t coordinationQueue = _coordinationQueue;
   if (!_coordinationQueue) {
     return;
   }
-  dispatch_async(coordinationQueue, ^{
+  dispatch_async(_coordinationQueue, ^{
     NSNumber *targetNumber = @(package.target);
     NSMutableDictionary<NSNumber *, GDTUploadPackage *> *targetToInFlightPackages =
         self->_targetToInFlightPackages;