move SkDevice.h and SkBitmapDevice.h contents in to src headers

BUG=skia:

Change-Id: I3d8d313f0500c13db21cb973fed4064ec3816912
Reviewed-on: https://skia-review.googlesource.com/7082
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp
index 47e0dbe..529bc43 100644
--- a/src/image/SkSurface_Raster.cpp
+++ b/src/image/SkSurface_Raster.cpp
@@ -5,11 +5,11 @@
  * found in the LICENSE file.
  */
 
-#include "SkSurface_Base.h"
-#include "SkImagePriv.h"
+#include "SkBaseDevice.h"
 #include "SkCanvas.h"
-#include "SkDevice.h"
+#include "SkImagePriv.h"
 #include "SkMallocPixelRef.h"
+#include "SkSurface_Base.h"
 
 static const size_t kIgnoreRowBytesValue = (size_t)~0;