Keep imports consistent (#2217)

Author: paulb777

Firebase/Core/FIRApp.m

@@ -14,15 +14,15 @@
 
 #include <sys/utsname.h>
 
+#import "FIRApp.h"
+#import "FIRConfiguration.h"
 #import "Private/FIRAnalyticsConfiguration+Internal.h"
 #import "Private/FIRAppInternal.h"
 #import "Private/FIRBundleUtil.h"
 #import "Private/FIRComponentContainerInternal.h"
 #import "Private/FIRLibrary.h"
 #import "Private/FIRLogger.h"
 #import "Private/FIROptionsInternal.h"
-#import "Public/FIRApp.h"
-#import "Public/FIRConfiguration.h"
 
 NSString *const kFIRServiceAdMob = @"AdMob";
 NSString *const kFIRServiceAuth = @"Auth";

Firebase/Core/FIRComponentType.m

@@ -16,7 +16,7 @@
 
 #import "Private/FIRComponentType.h"
 
-#import "FIRComponentContainerInternal.h"
+#import "Private/FIRComponentContainerInternal.h"
 
 @implementation FIRComponentType