layers: MR89, Fix gtests for android

Conflicts:
	layers/draw_state.cpp
	layers/image.cpp
	layers/mem_tracker.cpp
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index 538d89a..d3e9a92 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -1237,7 +1237,7 @@
 
 static const VkLayerProperties mtGlobalLayers[] = {
     {
-        "MemTracker",
+        "VK_LAYER_LUNARG_mem_tracker",
         VK_API_VERSION,
         VK_MAKE_VERSION(0, 1, 0),
         "Validation layer: MemTracker",