layers: MR89, Fix gtests for android

Conflicts:
	layers/draw_state.cpp
	layers/image.cpp
	layers/mem_tracker.cpp
diff --git a/layers/basic.cpp b/layers/basic.cpp
index 3c3c809..1e05475 100644
--- a/layers/basic.cpp
+++ b/layers/basic.cpp
@@ -51,7 +51,7 @@
 
 static const VkLayerProperties basic_physicaldevice_layers[] = {
     {
-        "Basic",
+        "VK_LAYER_LUNARG_basic",
         VK_API_VERSION,
         VK_MAKE_VERSION(0, 1, 0),
         "Sample layer: Basic, implements vkLayerExtension1",