Merge "lshal: --init-vintf use <fqname> only."