Fix buck build for SDN-IP and vRouter.

Change-Id: I99aac2ce477f7a2ba0d12dd46e669a25ebcfc750
diff --git a/apps/sdnip/BUCK b/apps/sdnip/BUCK
index 89e05e3a..b15d478 100644
--- a/apps/sdnip/BUCK
+++ b/apps/sdnip/BUCK
@@ -5,8 +5,9 @@
 ]
 
 BUNDLES = [
-    '//apps/routing-api:onos-apps-routing-api',
     '//apps/sdnip:onos-apps-sdnip',
+    '//apps/routing-api:onos-apps-routing-api',
+    '//apps/routing:onos-apps-routing',
 ]
 
 TEST_DEPS = [
@@ -25,5 +26,6 @@
   category = 'Utility',
   url = 'http://onosproject.org',
   included_bundles = BUNDLES,
+  required_apps = [ 'org.onosproject.proxyarp' ],
   description = 'SDN-IP peering application',
 )
diff --git a/apps/vrouter/BUCK b/apps/vrouter/BUCK
index 9f4591d..e2322e3 100644
--- a/apps/vrouter/BUCK
+++ b/apps/vrouter/BUCK
@@ -3,7 +3,13 @@
     '//incubator/api:onos-incubator-api',
 ]
 
-osgi_jar_with_tests (
+BUNDLES = [
+    '//apps/routing-api:onos-apps-routing-api',
+    '//apps/routing:onos-apps-routing',
+    '//apps/vrouter:onos-apps-vrouter',
+]
+
+osgi_jar (
     deps = COMPILE_DEPS,
 )
 
@@ -11,5 +17,6 @@
     title = 'Virtual Router App',
     category = 'Traffic Steering',
     url = 'http://onosproject.org',
+    included_bundles = BUNDLES,
     description = 'Virtual router (vRouter) application.',
 )