am 2d073283: Merge "Remove deprecated WITH_HOST_DALVIK."

* commit '2d073283b1a100d81b72cdbf07e898c5478bc3e0':
  Remove deprecated WITH_HOST_DALVIK.