Generate gm/Android.mk, minus JSON.

platform_tools/android/bin/gyp_to_android.py

Index: platform_tools/android/bin/gyp_to_android.py
diff --git a/platform_tools/android/bin/gyp_to_android.py b/platform_tools/android/bin/gyp_to_android.py
index 8994efdf0580d2762f9088a4b3ca1524cfcb604c..f6fc5785a2a4fcb26864225aec540ebeafcd25ec 100755
--- a/platform_tools/android/bin/gyp_to_android.py
+++ b/platform_tools/android/bin/gyp_to_android.py
@@ -144,6 +144,14 @@ def main(target_dir=None, require_sk_user_config=False):
                                        local_module_tags=['tests'],
                                        place_in_local_tmp=True)
 
+    tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
+                                       target_file='gm.gyp',
+                                       skia_trunk=target_dir,
+                                       dest_dir='gm',
+                                       skia_lib_var_dict=common,
+                                       local_module_name='skia_gm',
+                                       local_module_tags=['optional'])
+
     # Now that the defines have been written to SkUserConfig and they've been
     # used to skip adding them to the tools makefiles, they are not needed in
     # Android.mk. Reset DEFINES.