diff --git a/core/build_id.mk b/core/build_id.mk
index 4661aea..64ee0e1 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -23,7 +23,7 @@
 # (like "TC1-RC5").  It must be a single word, and is
 # capitalized by convention.
 #
-BUILD_ID := ECLAIR
+BUILD_ID := ECLAIR-MR2
 
 # DISPLAY_BUILD_NUMBER should only be set for development branches,
 # If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for
diff --git a/core/combo/darwin-x86.mk b/core/combo/darwin-x86.mk
index 2150960..65d6375 100644
--- a/core/combo/darwin-x86.mk
+++ b/core/combo/darwin-x86.mk
@@ -14,6 +14,7 @@
 $(combo_target)GLOBAL_CFLAGS += \
 	-include $(call select-android-config-h,darwin-x86)
 $(combo_target)RUN_RANLIB_AFTER_COPYING := true
+$(combo_target)GLOBAL_ARFLAGS := cqs
 
 ifeq ($(combo_target),TARGET_)
 $(combo_target)CUSTOM_LD_COMMAND := true
diff --git a/core/combo/select.mk b/core/combo/select.mk
index 793b0a9..ccdf1fb 100644
--- a/core/combo/select.mk
+++ b/core/combo/select.mk
@@ -40,7 +40,7 @@
 $(combo_target)GLOBAL_CFLAGS := -fno-exceptions -Wno-multichar
 $(combo_target)RELEASE_CFLAGS := -O2 -g -fno-strict-aliasing
 $(combo_target)GLOBAL_LDFLAGS :=
-$(combo_target)GLOBAL_ARFLAGS := crs
+$(combo_target)GLOBAL_ARFLAGS := crsP
 
 $(combo_target)EXECUTABLE_SUFFIX := 
 $(combo_target)SHLIB_SUFFIX := .so
diff --git a/core/definitions.mk b/core/definitions.mk
index 297e6b7..06b6201 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -931,7 +931,7 @@
 @rm -f $@
 $(extract-and-include-whole-static-libs)
 @echo "target StaticLib: $(PRIVATE_MODULE) ($@)"
-$(hide) $(TARGET_AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@ $^
+$(hide) echo $^ | xargs $(TARGET_AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@
 endef
 
 ###########################################################
@@ -944,7 +944,7 @@
 @mkdir -p $(dir $@)
 @echo "host StaticLib: $(PRIVATE_MODULE) ($@)"
 @rm -f $@
-$(HOST_AR) $(HOST_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@ $^
+echo $^ | xargs $(HOST_AR) $(HOST_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@
 endef
 
 
@@ -1334,11 +1334,9 @@
 $(hide) rm -rf $(dir $@)lib
 endef
 
-#TODO: use aapt instead of zip, once it supports junking the path
-#      (so adding "xxx/yyy/classes.dex" appears as "classes.dex")
 #TODO: update the manifest to point to the dex file
 define add-dex-to-package
-$(hide) zip -qj $@ $(PRIVATE_DEX_FILE)
+$(hide) $(AAPT) add -k $@ $(PRIVATE_DEX_FILE)
 endef
 
 define add-java-resources-to-package
diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk
index cfd72e7..478b572 100644
--- a/core/tasks/cts.mk
+++ b/core/tasks/cts.mk
@@ -70,7 +70,7 @@
 	CtsDatabaseTestCases \
 	CtsDpiTestCases \
 	CtsDpiTestCases2 \
-    CtsGestureTestCases \
+	CtsGestureTestCases \
 	CtsGraphicsTestCases \
 	CtsHardwareTestCases \
 	CtsLocationTestCases \