Have /src files use header directly.

src/core/SkDrawable.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 "SkCanvas.h"
 #include "SkDrawable.h"
 
 static int32_t next_generation_id() {
     static int32_t gCanvasDrawableGenerationID;
 
     // do a loop in case our global wraps around, as we never want to
     // return a 0
     int32_t genID;
     do {
@@ skipping 57 matching lines @@
     SkPictureRecorder recorder;
 
     const SkRect bounds = this->getBounds();
     SkCanvas* canvas = recorder.beginRecording(bounds, nullptr, 0);
     this->draw(canvas);
     if (false) {
         draw_bbox(canvas, bounds);
     }
     return recorder.endRecording();
 }