Merge remote-tracking branch 'aosp/upstream-master' into merge am: fcfff65866

Original change: https://android-review.googlesource.com/c/platform/external/erofs-utils/+/1899948

Change-Id: Ic59e6e30bb30b7a677db04b14512374d68b16d8a