Merge "lshal: --init-vintf use <fqname> only." am: a60de57fdc
am: 52dcea71ed

Change-Id: Ief87dd5f4ad553a56a50473afb1897216c5c35cd