Have /src files use header directly.

src/utils/SkEventTracer.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * 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 "SkEventTracer.h"
 #include "SkOncePtr.h"
 
 #include <stdlib.h>
 
 class SkDefaultEventTracer : public SkEventTracer {
     SkEventTracer::Handle
         addTraceEvent(char phase,
                       const uint8_t* categoryEnabledFlag,
                       const char* name,
@@ skipping 30 matching lines @@
     // An atomic load during process shutdown is probably overkill, but safe overkill.
     atexit([]() { delete sk_atomic_load(&gUserTracer, sk_memory_order_acquire); });
 }
 
 SkEventTracer* SkEventTracer::GetInstance() {
     if (SkEventTracer* tracer = sk_atomic_load(&gUserTracer, sk_memory_order_acquire)) {
         return tracer;
     }
     return gDefaultTracer.get([]{ return new SkDefaultEventTracer; });
 }