am 85ed0e10: Merge "Remove deprecated WITH_HOST_DALVIK."

* commit '85ed0e10781c3c57343300a02556dd5131c450aa':
  Remove deprecated WITH_HOST_DALVIK.