am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"

* commit 'bf6d9ec1fa2e1313c2ca8558c5f0710cbea201c1':
  You CANNOT change the global WITH_DEXPREOPT

Android.mk

@@ -437,6 +437,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := libprotobuf-java-2.3.0-nano \
         android-nano-test-parcelable \
         android-nano-test-parcelable-extendable
 
-WITH_DEXPREOPT := false
+LOCAL_DEX_PREOPT := false
 
 include $(BUILD_PACKAGE)