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