Snap for 4759746 from 47b7e876148e345142200af4ba8b99862ddcbdaf to pi-release

Change-Id: I93cc8897680cbba623aff59f6f21887d81919f81
diff --git a/Android.mk b/Android.mk
index 0fc7e26..db4c11a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -68,6 +68,7 @@
 LOCAL_JAVA_LIBRARIES := $(apache_http_java_libs)
 LOCAL_SRC_FILES := $(apache_http_src_files)
 LOCAL_MODULE_TAGS := optional
+LOCAL_DEX_PREOPT_APP_IMAGE := false
 ifeq ($(REMOVE_OAHL_FROM_BCP),true)
 # Previously, this JAR was included on the bootclasspath so was compiled using
 # the speed-profile. ensures that it continues to be compiled using the