Android.mk: bench_pictures -> nanobench

We're only keeping bench_pictures around for the bots now.  For human-initiated work, nanobench is the way to go.

BUG=skia:
R=djsollen@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/484663002
diff --git a/platform_tools/android/bin/gyp_to_android.py b/platform_tools/android/bin/gyp_to_android.py
index d1dd7bd..a42471b 100755
--- a/platform_tools/android/bin/gyp_to_android.py
+++ b/platform_tools/android/bin/gyp_to_android.py
@@ -132,13 +132,13 @@
         defines=common.DEFINES)
 
     tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
-                                       target_file='tools.gyp',
+                                       target_file='bench.gyp',
                                        skia_trunk=target_dir,
-                                       dest_dir='tools',
+                                       dest_dir='bench',
                                        skia_lib_var_dict=common,
-                                       local_module_name='skia_bench_pictures',
+                                       local_module_name='skia_nanobench',
                                        local_module_tags=['tests'],
-                                       desired_targets=['bench_pictures'])
+                                       desired_targets=['nanobench'])
 
     tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
                                        target_file='gm.gyp',