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/service.cpp b/service.cpp
index 740198a..823f0c7 100644
--- a/service.cpp
+++ b/service.cpp
@@ -18,6 +18,7 @@
 int main(int argc, char** argv)
 {
     android::sp<ArmnnDriver> driver;
+    DriverOptions driverOptions(argc, argv);
     try
     {
         driver = new ArmnnDriver(DriverOptions(argc, argv));
@@ -32,7 +33,7 @@
     android::status_t status = android::UNKNOWN_ERROR;
     try
     {
-        status = driver->registerAsService("arm-armnn");
+        status = driver->registerAsService(driverOptions.GetServiceName());
     }
     catch (const std::exception& e)
     {