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

Change-Id: Id28857bc67fcd6100d4a895cef086c5da64fc555