Merge "Fix the Mac build by adding a WITH_HOST_DALVIK test."