Fixing drivers & providers Buck app builds

Change-Id: I6a02a68568037eca0a0b82ad4f83ff18bfeada5f
diff --git a/drivers/fujitsu/BUCK b/drivers/fujitsu/BUCK
index 1020c17..4890811 100644
--- a/drivers/fujitsu/BUCK
+++ b/drivers/fujitsu/BUCK
@@ -11,6 +11,11 @@
     '//core/api:onos-api-tests',
 ]
 
+BUNDLES = [
+    ':onos-drivers-fujitsu',
+    '//drivers/utilities:onos-drivers-utilities',
+]
+
 osgi_jar_with_tests (
     deps = COMPILE_DEPS,
     test_deps = TEST_DEPS,
@@ -19,9 +24,11 @@
 )
 
 onos_app (
+    app_name = 'org.onosproject.drivers.fujitsu',
     title = 'Fujitsu device drivers',
     category = 'Drivers',
     url = 'http://onosproject.org',
     description = 'ONOS Fujitsu device drivers application.',
+    included_bundles = BUNDLES,
     required_apps = [ 'org.onosproject.netconf' ],
 )
diff --git a/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuDriversLoader.java b/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuDriversLoader.java
index b9b3789..b81d30a 100644
--- a/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuDriversLoader.java
+++ b/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuDriversLoader.java
@@ -17,6 +17,7 @@
 package org.onosproject.drivers.fujitsu;
 
 import org.apache.felix.scr.annotations.Component;
+import org.onosproject.cli.net.DeviceIdCompleter;
 import org.onosproject.net.driver.AbstractDriverLoader;
 import org.onosproject.net.optical.OpticalDevice;
 
@@ -29,6 +30,8 @@
     // OSGI: help bundle plugin discover runtime package dependency.
     @SuppressWarnings("unused")
     private OpticalDevice optical;
+    @SuppressWarnings("unused")
+    private DeviceIdCompleter deviceIdCompleter;
 
     public FujitsuDriversLoader() {
         super("/fujitsu-drivers.xml");