Merge remote-tracking branch 'aosp/upstream-master' into aosp-master

Bump erofs-utils to version 1.6

Bug: 258877268
Change-Id: I12abc51d0c1b0993420969b275d258ea973a6550