Merge "Fix VM-less builds."