diff --git a/thermal/1.1/Android.bp b/thermal/1.1/Android.bp
index 833f219..ab44619 100644
--- a/thermal/1.1/Android.bp
+++ b/thermal/1.1/Android.bp
@@ -42,7 +42,7 @@
     ],
 }
 
-cc_library_shared {
+cc_library {
     name: "android.hardware.thermal@1.1",
     defaults: ["hidl-module-defaults"],
     generated_sources: ["android.hardware.thermal@1.1_genc++"],
diff --git a/thermal/1.1/Android.mk b/thermal/1.1/Android.mk
index 082d65b..21d2a49 100644
--- a/thermal/1.1/Android.mk
+++ b/thermal/1.1/Android.mk
@@ -16,6 +16,8 @@
     android.hardware.thermal-V1.0-java \
     android.hidl.base-V1.0-java \
 
+LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_JAVA_LIBRARIES += core-oj hwbinder
 
 #
 # Build IThermal.hal
@@ -73,6 +75,8 @@
     android.hardware.thermal-V1.0-java-static \
     android.hidl.base-V1.0-java-static \
 
+LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_JAVA_LIBRARIES := core-oj hwbinder
 
 #
 # Build IThermal.hal