IVGCVSW-4837 Add driver service name command line option

* revert commit 8a510e8e9ed22ec0bbd295b69a6700ad0ba7cfd8
* Add driver option to give service a name, default to "armnn"

Change-Id: I9755206494f637bee4c8299bf6370fc4731638c8
Signed-off-by: Kevin May <kevin.may@arm.com>
diff --git a/DriverOptions.cpp b/DriverOptions.cpp
index 94fd594..1f534b6 100644
--- a/DriverOptions.cpp
+++ b/DriverOptions.cpp
@@ -76,6 +76,10 @@
          po::value<std::string>(&m_RequestInputsAndOutputsDumpDir)->default_value(""),
          "If non-empty, the directory where request inputs and outputs should be dumped")
 
+        ("service-name,n",
+         po::value<std::string>(&m_ServiceName)->default_value("armnn"),
+         "If non-empty, the driver service name to be registered")
+
         ("unsupported-operations,u",
          po::value<std::string>(&unsupportedOperationsAsString)->default_value(""),
          "If non-empty, a comma-separated list of operation indices which the driver will forcibly "