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

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



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