agent and runner extension for shell driver

Change-Id: I10ab6bbb45e9f74f52451e0b0f75cb29837b5754
diff --git a/sysfuzzer/framework/VtsFuzzerMain.cpp b/sysfuzzer/framework/VtsFuzzerMain.cpp
index e537ab8..8f9b442 100644
--- a/sysfuzzer/framework/VtsFuzzerMain.cpp
+++ b/sysfuzzer/framework/VtsFuzzerMain.cpp
@@ -86,7 +86,7 @@
     {"epoch_count",          required_argument, NULL, 'e'},
     {"spec_dir",             required_argument, NULL, 's'},
 #ifndef VTS_AGENT_DRIVER_COMM_BINDER  // socket
-    {"socket_port_file",     optional_argument, NULL, 'f'},
+    {"server_socket_path",   optional_argument, NULL, 'f'},
 #else  // binder
     {"service_name",         required_argument, NULL, 'n'},
 #endif
@@ -100,7 +100,7 @@
   string spec_dir_path(DEFAULT_SPEC_DIR_PATH);
   bool server = false;
 #ifndef VTS_AGENT_DRIVER_COMM_BINDER  // socket
-  string socket_port_file;
+  string server_socket_path;
 #else  // binder
   string service_name(VTS_FUZZER_BINDER_SERVICE_NAME);
 #endif
@@ -163,7 +163,7 @@
         break;
 #ifndef VTS_AGENT_DRIVER_COMM_BINDER  // socket
       case 'f':
-        socket_port_file = string(optarg);
+        server_socket_path = string(optarg);
         break;
 #else  // binder
       case 'n':
@@ -198,11 +198,11 @@
     }
   } else {
 #ifndef VTS_AGENT_DRIVER_COMM_BINDER  // socket
-    android::vts::StartSocketServer(socket_port_file, spec_builder,
-                                    INTERFACE_SPEC_LIB_FILENAME);
+    android::vts::StartSocketServer(
+        server_socket_path, spec_builder, INTERFACE_SPEC_LIB_FILENAME);
 #else  // binder
-    android::vts::StartBinderServer(service_name, spec_builder,
-                                    INTERFACE_SPEC_LIB_FILENAME);
+    android::vts::StartBinderServer(
+        service_name, spec_builder, INTERFACE_SPEC_LIB_FILENAME);
 #endif
   }
   return 0;