Merge "fix broken build rules for host VM."