Merge "Remove libvintf from credstore"