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

Change-Id: Iee908794803aedfb423d2cd7c765d7fdd6cde9b9