Merge "Fix minor version bump reflected in lshal --init-vintf"
am: ac6575097d

Change-Id: I05dafdba2c7f302dc6200bd2d274e30a33f77de7