Merge "libbase from latest crosvm also needs to be renamed."