Revert of Split iOS sdk in to separate targets

webrtc/test/testsupport/iosfileutils.mm

 /*
  *  Copyright 2015 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #if defined(WEBRTC_IOS)
 
 #import <Foundation/Foundation.h>
 #include <string.h>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/typedefs.h"
-#include "webrtc/sdk/objc/Framework/Classes/Common/helpers.h"
+#include "webrtc/sdk/objc/Framework/Classes/helpers.h"
 
 namespace webrtc {
 namespace test {
 
 using webrtc::ios::NSStringFromStdString;
 using webrtc::ios::StdStringFromNSString;
 
 // For iOS, resource files are added to the application bundle in the root
 // and not in separate folders as is the case for other platforms. This method
 // therefore removes any prepended folders and uses only the actual file name.
@@ skipping 25 matching lines @@
     if (tempDir == nil)
         tempDir = @"/tmp";
     return StdStringFromNSString(tempDir);
   }
 }
 
 }  // namespace test
 }  // namespace webrtc
 
 #endif  // defined(WEBRTC_IOS)