Separate oat from image

Change-Id: If2abdb99826ead14e3465d90ba2acffd89709389
diff --git a/test/056-const-string-jumbo/build b/test/056-const-string-jumbo/build
index 98f27b8..c39779b 100644
--- a/test/056-const-string-jumbo/build
+++ b/test/056-const-string-jumbo/build
@@ -48,7 +48,9 @@
 
 dex2oatd -Xms16m -Xmx16m \
     --boot-dex-file=${ANDROID_PRODUCT_OUT}/system/framework/core.jar \
-    --boot=${ANDROID_PRODUCT_OUT}/system/framework/core.oat \
+    --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 \
-    --image=${ANDROID_PRODUCT_OUT}/system/framework/test.oat \
+    --oat=${ANDROID_PRODUCT_OUT}/system/framework/test.oat \
+    --image=${ANDROID_PRODUCT_OUT}/system/framework/test.art \
     --strip-prefix=${ANDROID_PRODUCT_OUT}