diff --git a/Android.mk b/Android.mk
index 5c921e8..1145621 100644
--- a/Android.mk
+++ b/Android.mk
@@ -137,7 +137,7 @@
 
 LOCAL_ANNOTATION_PROCESSORS := \
 	dialer-auto-value \
-	dialer-javapoet \
+	javapoet-prebuilt-jar \
 	dialer-dagger2 \
 	dialer-dagger2-compiler \
 	dialer-dagger2-producers \
@@ -206,7 +206,6 @@
     dialer-guava:../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/23.0/guava-23.0.jar \
     dialer-javax-annotation-api:../../../prebuilts/tools/common/m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar \
     dialer-javax-inject:../../../prebuilts/tools/common/m2/repository/javax/inject/javax.inject/1/javax.inject-1.jar \
-    dialer-javapoet:../../../prebuilts/tools/common/m2/repository/com/squareup/javapoet/1.8.0/javapoet-1.8.0.jar \
     dialer-auto-service:../../../prebuilts/tools/common/m2/repository/com/google/auto/service/auto-service/1.0-rc2/auto-service-1.0-rc2.jar \
     dialer-auto-common:../../../prebuilts/tools/common/m2/repository/com/google/auto/auto-common/0.9/auto-common-0.9.jar \
 
@@ -439,7 +438,7 @@
 LOCAL_STATIC_JAVA_LIBRARIES := \
 	dialer-guava \
 	dialer-dagger2 \
-	dialer-javapoet \
+	javapoet-prebuilt-jar \
 	dialer-auto-service \
 	dialer-auto-common \
 	dialer-javax-annotation-api \