Consolidate GPU buffer implementations

src/gpu/vk/GrVkGpu.h

Index: src/gpu/vk/GrVkGpu.h
diff --git a/src/gpu/vk/GrVkGpu.h b/src/gpu/vk/GrVkGpu.h
index c39973a4e786c2be20bcce10f98f5cb7a7083d4b..a4833174f28b3f5f058ad9c867a9a28a9cb0b0bb 100644
--- a/src/gpu/vk/GrVkGpu.h
+++ b/src/gpu/vk/GrVkGpu.h
@@ -147,8 +147,8 @@ private:
         return NULL;
     }
 
-    GrVertexBuffer* onCreateVertexBuffer(size_t size, bool dynamic) override;
-    GrIndexBuffer* onCreateIndexBuffer(size_t size, bool dynamic) override;
+    GrBuffer* onCreateVertexBuffer(size_t size, bool dynamic) override;
+    GrBuffer* onCreateIndexBuffer(size_t size, bool dynamic) override;
     GrTransferBuffer* onCreateTransferBuffer(size_t size, TransferType type) override;
 
     void onClear(GrRenderTarget*, const SkIRect& rect, GrColor color) override;
@@ -172,7 +172,7 @@ private:
 
     bool onTransferPixels(GrSurface*,
                           int left, int top, int width, int height,
-                          GrPixelConfig config, GrTransferBuffer* buffer,
+                          GrPixelConfig config, GrBuffer* transferBuffer,
                           size_t offset, size_t rowBytes) override {
         SkDebugf("onTransferPixels not yet implemented for Vulkan\n");
         return false;