install selected prebuilts for PDK Java build

Bug: 6352960
Change-Id: I27ded7776be1b6260cbc11330573697fc0043cb6
diff --git a/tools/Android.mk b/tools/Android.mk
index cd183be..ffda6cf 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -16,9 +16,10 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-ifneq ($(TARGET_BUILD_APPS),)
+ifneq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
 
 ##################################
+ifneq ($(TARGET_BUILD_PDK),true)
 include $(CLEAR_VARS)
 
 # We can't simple call $(BUILD_PREBUILT) here, because $(ACP) is not
@@ -33,6 +34,7 @@
 	@echo "Copy: acp ($@)"
 	$(copy-file-to-target-with-cp)
 	$(hide) chmod 755 $@
+endif
 
 ##################################
 include $(CLEAR_VARS)
@@ -74,6 +76,7 @@
 include $(BUILD_PREBUILT)
 
 ##################################
+ifneq ($(TARGET_BUILD_PDK),true)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := zipalign
@@ -85,6 +88,7 @@
 LOCAL_IS_HOST_MODULE := true
 
 include $(BUILD_PREBUILT)
+endif
 
 ##################################
 include $(CLEAR_VARS)