Merge "Fix incorrect bitness for lshal --init-vintf"