Merge "lshal --init-vintf stripped <impl> tag." into oc-dev
am: 7ad6b13213

Change-Id: Ib463dd6572229c3e09a17482f318b36825ed6547