Merge "Fix incorrect bitness for lshal --init-vintf" am: e162a97703 am: 126eee4d14 am: c77bc022f7  -s ours
am: 1987126c27  -s ours

Change-Id: I049166d7bf1102a9b9af79b07598cfe5bb25eece