Merge "Fix minor version bump reflected in lshal --init-vintf" am: ac6575097d am: 99065302ed
am: cf64ff00ea  -s ours

Change-Id: I9811de0500a5d5172744c962549524416c3183e3