resolved conflicts for merge of 123995f9 to honeycomb-plus-aosp

Change-Id: I3665ae5778120499117806e7301a7be6dfff91cf
diff --git a/core/main.mk b/core/main.mk
index e5824db..a5ee6d1 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -830,9 +830,10 @@
 sdk: $(ALL_SDK_TARGETS)
 ifneq ($(filter sdk win_sdk,$(MAKECMDGOALS)),)
 $(call dist-for-goals,sdk win_sdk, \
-	$(ALL_SDK_TARGETS) \
-	$(SYMBOLS_ZIP) \
- )
+    $(ALL_SDK_TARGETS) \
+    $(SYMBOLS_ZIP) \
+    $(INSTALLED_BUILD_PROP_TARGET) \
+)
 endif
 
 .PHONY: samplecode