am a97fc534: am a3f1cb68: Merge "Remove deprecated WITH_HOST_DALVIK."

* commit 'a97fc53412f89f211433406d86e5674def6d3314':
  Remove deprecated WITH_HOST_DALVIK.