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

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



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