Merge "Edit hidl instances to remove vintf"