Merge "lshal: uses instances API for --init-vintf" am: ca83d35944
am: 95aefb52c2

Change-Id: Ie820bd8f409ed3bfb7a523492276dbcfb6b5cb99