Merge "Skip junit-hostdex unless WITH_HOST_DALVIK=true to fix Mac build"