Generate bench/Android.mk from gyp.

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 e88539964482018b768e460aa35fada7105b7185..8994efdf0580d2762f9088a4b3ca1524cfcb604c 100755
--- a/platform_tools/android/bin/gyp_to_android.py
+++ b/platform_tools/android/bin/gyp_to_android.py
@@ -135,14 +135,14 @@ def main(target_dir=None, require_sk_user_config=False):
                                        local_module_name='skia_test',
                                        local_module_tags=['eng', 'tests'])
 
-    # TODO (scroggo): Generate bench/Android.mk. See skbug.com/2448
-    #tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
-    #                                   target_file='bench.gyp',
-    #                                   skia_trunk=target_dir,
-    #                                   dest_dir='bench',
-    #                                   skia_lib_var_dict=common,
-    #                                   local_module_name='skia_bench',
-    #                                   local_module_tags=['tests'])
+    tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
+                                       target_file='bench.gyp',
+                                       skia_trunk=target_dir,
+                                       dest_dir='bench',
+                                       skia_lib_var_dict=common,
+                                       local_module_name='skia_bench',
+                                       local_module_tags=['tests'],
+                                       place_in_local_tmp=True)
 
     # 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