Merge "Merge remote-tracking branch 'aosp/upstream-master' into aosp" am: 88bfaff47a am: 38156f890f am: a94b7438e8

Original change: https://android-review.googlesource.com/c/platform/external/f2fs-tools/+/1416453

Change-Id: I680b0f56776167137c0fc2276d68b039bf91cefc