Simplify command line arguments

Change-Id: I9d6902b0c447fd8fbe5600fd36139791b2ceefb7
diff --git a/test/etc/default-build b/test/etc/default-build
index e31e0ea..0ef8ba8 100755
--- a/test/etc/default-build
+++ b/test/etc/default-build
@@ -29,13 +29,11 @@
 zip ${ANDROID_PRODUCT_OUT}/system/framework/test.jar classes.dex
 
 dex2oatd -Xms16m -Xmx16m \
-    --boot-dex-file=${ANDROID_PRODUCT_OUT}/system/framework/core.jar \
-    --boot-oat=${ANDROID_PRODUCT_OUT}/system/framework/core.oat \
     --boot-image=${ANDROID_PRODUCT_OUT}/system/framework/core.art \
     --dex-file=${ANDROID_PRODUCT_OUT}/system/framework/test.jar \
     --oat=${ANDROID_PRODUCT_OUT}/system/framework/test.oat \
     --image=${ANDROID_PRODUCT_OUT}/system/framework/test.art \
-    --strip-prefix=${ANDROID_PRODUCT_OUT}
+    --host-prefix=${ANDROID_PRODUCT_OUT}
 
 if [ -r src-ex ]; then
     mkdir classes-ex
@@ -51,11 +49,9 @@
     mv classes-1.dex classes.dex
 
     dex2oatd -Xms16m -Xmx16m \
-        --boot-dex-file=${ANDROID_PRODUCT_OUT}/system/framework/core.jar \
-        --boot-oat=${ANDROID_PRODUCT_OUT}/system/framework/core.oat \
         --boot-image=${ANDROID_PRODUCT_OUT}/system/framework/core.art \
         --dex-file=${ANDROID_PRODUCT_OUT}/system/framework/test-ex.jar \
         --oat=${ANDROID_PRODUCT_OUT}/system/framework/test-ex.oat \
         --image=${ANDROID_PRODUCT_OUT}/system/framework/test-ex.art \
-        --strip-prefix=${ANDROID_PRODUCT_OUT}
+        --host-prefix=${ANDROID_PRODUCT_OUT}
 fi