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

Change-Id: Idaa848f62fe52e04a364fb1d9fb22b36ef4bce2f