Merge "Add support for specifying erofs blocksize" into main am: cc1a5602 am: 03c5c0ca

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



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