Merge "Fix ext4 size estimates" into main am: 1cc90269

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



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