[automerger skipped]Merge "lshal: uses instances API for --init-vintf" into pi-dev am: 0bc21a6b52  -s ours
am: d7b8c77c32  -s ours

Change-Id: I3418a6913e0991c3bcd79ccf9122947fe4240a4b