layers: MR89, Fix gtests for android

Conflicts:
	layers/draw_state.cpp
	layers/image.cpp
	layers/mem_tracker.cpp
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index a4385ed..fc42886 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -2884,7 +2884,7 @@
 
 static const VkLayerProperties ds_global_layers[] = {
     {
-        "DrawState",
+        "VK_LAYER_LUNARG_draw_state",
         VK_API_VERSION,
         VK_MAKE_VERSION(0, 1, 0),
         "Validation layer: DrawState",