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

Change-Id: I805216fb9c76e339acea027a28cf8f6a3442e55b