Merge "lshal --init-vintf stripped <impl> tag." am: b7003ce5d4
am: e0b65151d8

Change-Id: Ie7efd9f294713804a5210567d1a3a2e0ca14ce61