Merge "libvintf 2.0."