Fix max image size calculation

Now that 0.12 does not sort the structures in offset-order, the calculation in prepare_filesystem() for whether the calculated image size fits within the specified --image-size is incorrect. It must look at the rootfs size + the farthest out partition. This is calculated in make_disk().