Revert of Some Vulkan memory fixes and cleanup

src/gpu/vk/GrVkMemory.h

Index: src/gpu/vk/GrVkMemory.h
diff --git a/src/gpu/vk/GrVkMemory.h b/src/gpu/vk/GrVkMemory.h
index 34850dba06dfa631f0c62d8194ffcb806ec59051..f8d5fdf91c8d273f81721f0de7c8511667847adc 100644
--- a/src/gpu/vk/GrVkMemory.h
+++ b/src/gpu/vk/GrVkMemory.h
@@ -93,7 +93,7 @@
 
 class GrVkSubHeap : public GrVkFreeListAlloc {
 public:
-    GrVkSubHeap(const GrVkGpu* gpu, uint32_t memoryTypeIndex, uint32_t heapIndex,
+    GrVkSubHeap(const GrVkGpu* gpu, uint32_t memoryTypeIndex,
                 VkDeviceSize size, VkDeviceSize alignment);
     ~GrVkSubHeap();
 
@@ -106,7 +106,6 @@
 private:
     const GrVkGpu* fGpu;
     uint32_t       fMemoryTypeIndex;
-    uint32_t       fHeapIndex;
     VkDeviceMemory fAlloc;
 
     typedef GrVkFreeListAlloc INHERITED;
@@ -136,24 +135,21 @@
     VkDeviceSize allocSize() const { return fAllocSize; }
     VkDeviceSize usedSize() const { return fUsedSize; }
 
-    bool alloc(VkDeviceSize size, VkDeviceSize alignment, uint32_t memoryTypeIndex,
-               uint32_t heapIndex, GrVkAlloc* alloc) {
+    bool alloc(VkDeviceSize size, VkDeviceSize alignment, uint32_t memoryTypeIndex, 
+               GrVkAlloc* alloc) {
         SkASSERT(size > 0);
-        return (*this.*fAllocFunc)(size, alignment, memoryTypeIndex, heapIndex, alloc);
+        return (*this.*fAllocFunc)(size, alignment, memoryTypeIndex, alloc);
     }
     bool free(const GrVkAlloc& alloc);
 
 private:
-    typedef bool (GrVkHeap::*AllocFunc)(VkDeviceSize size, VkDeviceSize alignment,
-                                        uint32_t memoryTypeIndex, uint32_t heapIndex,
-                                        GrVkAlloc* alloc);
+    typedef bool (GrVkHeap::*AllocFunc)(VkDeviceSize size, VkDeviceSize alignment, 
+                                        uint32_t memoryTypeIndex, GrVkAlloc* alloc);
 
-    bool subAlloc(VkDeviceSize size, VkDeviceSize alignment,
-                  uint32_t memoryTypeIndex, uint32_t heapIndex,
-                  GrVkAlloc* alloc);
+    bool subAlloc(VkDeviceSize size, VkDeviceSize alignment, 
+                  uint32_t memoryTypeIndex, GrVkAlloc* alloc);
     bool singleAlloc(VkDeviceSize size, VkDeviceSize alignment,
-                     uint32_t memoryTypeIndex, uint32_t heapIndex,
-                     GrVkAlloc* alloc);
+                     uint32_t memoryTypeIndex, GrVkAlloc* alloc);
 
     const GrVkGpu*         fGpu;
     VkDeviceSize           fSubHeapSize;