am 0d073451: am 9a954de3: am 8fb55d06: Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."

* commit '0d073451e7a453ccfb952505b27ec1effdc3a674':
  Remove some uses of the deprecated WITH_HOST_DALVIK.