Have /src files use header directly.

src/core/SkString.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkFixed.h"
 #include "SkString.h"
 #include "SkUtils.h"
 #include <stdarg.h>
 #include <stdio.h>
 
 // number of bytes (on the stack) to receive the printf result
 static const size_t kBufferSize = 1024;
 
 #ifdef SK_BUILD_FOR_WIN
@@ skipping 610 matching lines @@
         const size_t len = strcspn(str, delimiters);
         out->push_back().set(str, len);
         str += len;
         // Skip any delimiters.
         str += strspn(str, delimiters);
     }
 }
 
 #undef VSNPRINTF
 #undef SNPRINTF