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

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

Change-Id: I48a342b2797f2432714e6135e2afb9b53001409a