am ab6f84e3: am e0df9d95: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so"

* commit 'ab6f84e3d1886237e9516ebe4660d8e1042a6a75':
  Only enable WITH_DEXPREOPT by default for libdvm.so