diff --git a/vibrator/aidl/default/example_java_client/Android.bp b/vibrator/aidl/default/example_vendor_java_client/Android.bp
similarity index 65%
rename from vibrator/aidl/default/example_java_client/Android.bp
rename to vibrator/aidl/default/example_vendor_java_client/Android.bp
index a0baabc..f615cb1 100644
--- a/vibrator/aidl/default/example_java_client/Android.bp
+++ b/vibrator/aidl/default/example_vendor_java_client/Android.bp
@@ -10,8 +10,7 @@
 cc_library {
     name: "libexample_vib_getter",
     srcs: ["getter.cpp"],
-    product_available: true,
-    vendor_available: true,
+    vendor: true,
     shared_libs: [
         "liblog",
         "libbinder_ndk",
@@ -27,21 +26,6 @@
     vendor: true,
     static_libs: ["android.hardware.vibrator-V1-java"],
     jni_libs: ["libexample_vib_getter"],
-    use_embedded_native_libs: true,
-    jarjar_rules: "jarjar.txt",
-    stl: "c++_shared",
-    srcs: ["example/vib/MyActivity.java"],
-    sdk_version: "system_current",
-    visibility: [":__subpackages__"],
-}
-
-android_app {
-    name: "ExampleVibratorJavaProductClient",
-    privileged: true,
-    product_specific: true,
-    static_libs: ["android.hardware.vibrator-V1-java"],
-    jni_libs: ["libexample_vib_getter"],
-    use_embedded_native_libs: true,
     jarjar_rules: "jarjar.txt",
     stl: "c++_shared",
     srcs: ["example/vib/MyActivity.java"],
diff --git a/vibrator/aidl/default/example_java_client/AndroidManifest.xml b/vibrator/aidl/default/example_vendor_java_client/AndroidManifest.xml
similarity index 100%
rename from vibrator/aidl/default/example_java_client/AndroidManifest.xml
rename to vibrator/aidl/default/example_vendor_java_client/AndroidManifest.xml
diff --git a/vibrator/aidl/default/example_java_client/example/vib/MyActivity.java b/vibrator/aidl/default/example_vendor_java_client/example/vib/MyActivity.java
similarity index 100%
rename from vibrator/aidl/default/example_java_client/example/vib/MyActivity.java
rename to vibrator/aidl/default/example_vendor_java_client/example/vib/MyActivity.java
diff --git a/vibrator/aidl/default/example_java_client/getter.cpp b/vibrator/aidl/default/example_vendor_java_client/getter.cpp
similarity index 100%
rename from vibrator/aidl/default/example_java_client/getter.cpp
rename to vibrator/aidl/default/example_vendor_java_client/getter.cpp
diff --git a/vibrator/aidl/default/example_java_client/jarjar.txt b/vibrator/aidl/default/example_vendor_java_client/jarjar.txt
similarity index 100%
rename from vibrator/aidl/default/example_java_client/jarjar.txt
rename to vibrator/aidl/default/example_vendor_java_client/jarjar.txt