layers: MR89, Fix gtests for android

Conflicts:
	layers/draw_state.cpp
	layers/image.cpp
	layers/mem_tracker.cpp
diff --git a/vk-layer-generate.py b/vk-layer-generate.py
index f05dbd2..0be8924 100755
--- a/vk-layer-generate.py
+++ b/vk-layer-generate.py
@@ -313,10 +313,12 @@
             # Do nothing, extension definition part of generic.h
             ggep_body.append('%s' % self.lineinfo.get())
         else:
+            layer_name = re.sub('(.)([A-Z][a-z]+)', r'\1_\2', layer)
+            layer_name = re.sub('([a-z0-9])([A-Z])', r'\1_\2', layer_name).lower()
             ggep_body.append('%s' % self.lineinfo.get())
             ggep_body.append('static const VkLayerProperties globalLayerProps[] = {')
             ggep_body.append('    {')
-            ggep_body.append('        "%s",' % layer)
+            ggep_body.append('        "VK_LAYER_LUNARG_%s",' % layer_name)
             ggep_body.append('        VK_API_VERSION, // specVersion')
             ggep_body.append('        VK_MAKE_VERSION(0, 1, 0), // implementationVersion')
             ggep_body.append('        "layer: %s",' % layer)