Revert of Move BenchTimer to tools as Timer

platform_tools/android/gyp/skia_android.gypi

 {
   'targets': [
     {
       'target_name': 'CopySampleAppDeps',
       'type': 'none',
       'dependencies': [
         'skia_lib.gyp:skia_lib',
         'SampleApp.gyp:SampleApp',
       ],
       'variables': {
@@ skipping 27 matching lines @@
               ]}, {
               'files': [
                 '<(SHARED_LIB_DIR)/libSampleApp.so',
              ]}
            ],
           ],
         },
       ],
     },
     {
+      'target_name': 'skia_launcher',
+      'type': 'executable',
+      'sources': [
+        '../launcher/skia_launcher.cpp',
+      ],
+    },
+    {
       'target_name': 'SampleApp_APK',
       'type': 'none',
       'dependencies': [
         'CopySampleAppDeps',
       ],
       'variables': {
          'ANDROID_SDK_ROOT': '<!(echo $ANDROID_SDK_ROOT)',
          # the ninja generator treats PRODUCT_DIR as a relative path to the
          # gyp directory but android ant build wants a path relative to the
          # build.xml file so we do that adjustment here.
@@ skipping 25 matching lines @@
             '-Dnative.libs.absolute.dir=<(ANDROID_OUT)/libs',
             '-Dout.final.file=<(ANDROID_OUT)/bin/SkiaAndroid.apk',
             '-Dsdk.dir=<(ANDROID_SDK_ROOT)',
             'debug',
           ],
         },
       ],
     },
   ],
 }