am e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds."

* commit 'e854276dd19ee0ce139cc35f98b49189b7750b2d':
  Disable WITH_HOST_DALVIK on 64bit host builds.