Merge "lshal: use new libvintf API"