Merge "Remove 'optional' functionality from libvintf" into main