diff --git a/java/androidaudioplugin/build.gradle b/java/androidaudioplugin/build.gradle
index a1f88732..54a182a6 100644
--- a/java/androidaudioplugin/build.gradle
+++ b/java/androidaudioplugin/build.gradle
@@ -51,6 +51,8 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    // FIXME: PREFAB: enable these sections once we migrate to prefab-based solution.
+    /*
     buildFeatures {
         prefabPublishing true
     }
@@ -58,16 +60,17 @@ android {
     packagingOptions {
         exclude '**.so'
     }
-    // WARNING: It's not working https://github.com/atsushieno/android-audio-plugin-framework/issues/57
     prefab {
         androidaudioplugin {
             name 'androidaudioplugin'
+            // WARNING: It's not working https://github.com/atsushieno/android-audio-plugin-framework/issues/57
             // There is no way to specify more than one include directory.
             // headers '../../native/androidaudioplugin/android/include'
             // FIXME: remove this dummy headers dir hack once https://issuetracker.google.com/issues/172105145 is supported.
             headers '../../dummy-prefab-headers/include'
         }
     }
+    */
 }
 
 afterEvaluate {
diff --git a/java/samples/aapbarebonepluginsample/CMakeLists.txt b/java/samples/aapbarebonepluginsample/CMakeLists.txt
index 1c4c1453..a8a161d9 100644
--- a/java/samples/aapbarebonepluginsample/CMakeLists.txt
+++ b/java/samples/aapbarebonepluginsample/CMakeLists.txt
@@ -42,7 +42,7 @@ target_compile_options(aapbarebonepluginsample
         -Wshadow-field
         )
 
-if (TRUE)
+if (BUILD_WITH_PREFAB)
 if (ANDROID)
     find_package (androidaudioplugin REQUIRED CONFIG)
     set (aapbarebonepluginsample_LIBS
diff --git a/java/samples/aapbarebonepluginsample/build.gradle b/java/samples/aapbarebonepluginsample/build.gradle
index 828a282e..a9f5862d 100644
--- a/java/samples/aapbarebonepluginsample/build.gradle
+++ b/java/samples/aapbarebonepluginsample/build.gradle
@@ -21,9 +21,12 @@ android {
             }
         }
     }
+    // FIXME: PREFAB: enable these sections once we migrate to prefab-based solution.
+    /*
     buildFeatures {
         prefab true
     }
+    */
     externalNativeBuild {
         cmake {
             path "CMakeLists.txt"
diff --git a/java/samples/aaphostsample/CMakeLists.txt b/java/samples/aaphostsample/CMakeLists.txt
index 95d5419b..d7a8281c 100644
--- a/java/samples/aaphostsample/CMakeLists.txt
+++ b/java/samples/aaphostsample/CMakeLists.txt
@@ -47,7 +47,7 @@ target_compile_options(aaphostsample
         -Wshadow-field
         )
 
-if (TRUE)
+if (BUILD_WITH_PREFAB)
 if (ANDROID)
     find_package (androidaudioplugin REQUIRED CONFIG)
     set (aaphostsample_LIBS
diff --git a/java/samples/aaphostsample/build.gradle b/java/samples/aaphostsample/build.gradle
index 0d178607..5b2344f3 100644
--- a/java/samples/aaphostsample/build.gradle
+++ b/java/samples/aaphostsample/build.gradle
@@ -25,9 +25,12 @@ android {
             }
         }
     }
+    // FIXME: PREFAB: enable these sections once we migrate to prefab-based solution.
+    /*
     buildFeatures {
         prefab true
     }
+    */
     buildTypes {
         release {
             minifyEnabled false