move osgi_feature() and wrapped_osgi_jar() out of the bazel prelude

Change-Id: I0266ab4dbf0d0845ccbd940f2d0d3b230bd55260
diff --git a/tools/build_rules/prelude_bazel b/tools/build_rules/prelude_bazel
index 6114082..11451e0 100644
--- a/tools/build_rules/prelude_bazel
+++ b/tools/build_rules/prelude_bazel
@@ -1,8 +1,17 @@
-load("//tools/build/bazel:generate_workspace.bzl",
-        "generated_java_libraries", "COMPILE", "CORE_DEPS", "JACKSON",
-        "TEST_ADAPTERS", "TEST", "TEST_REST", "METRICS", "KRYO", "NETTY", "GRPC_1_3")
-
-load("//tools/build/bazel:osgi_java_library.bzl", "osgi_jar_with_tests", "osgi_jar", "wrapped_osgi_jar")
-load("//tools/build/bazel:osgi_features.bzl", "osgi_feature")
+load(
+    "//tools/build/bazel:generate_workspace.bzl",
+    "COMPILE",
+    "CORE_DEPS",
+    "GRPC_1_3",
+    "JACKSON",
+    "KRYO",
+    "METRICS",
+    "NETTY",
+    "TEST",
+    "TEST_ADAPTERS",
+    "TEST_REST",
+    "generated_java_libraries",
+)
+load("//tools/build/bazel:osgi_java_library.bzl", "osgi_jar", "osgi_jar_with_tests")
 
 generated_java_libraries()