am 8fb55d06: Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."

* commit '8fb55d06c7bd153e673c1372b3af75bcb849ed9d':
  Remove some uses of the deprecated WITH_HOST_DALVIK.