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

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



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