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

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