Merge "Add support for different F2FS block sizes" into main am: 5514a5aa

Original change: https://android-review.googlesource.com/c/platform/build/+/2835796



Change-Id: I452c9665ca1f92842dd53a4fbe83805e2fd92f0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>