Merge "lshal --init-vintf stripped <impl> tag."