Merge "Remove usage of base/string/* in libfs_avb" into main