Merge "libfstab: Optimize out C++ object copy" into main