Remove duplication in disk checks

Split the image and fs resize checks into separate methods since they
are used in different ways. This also strips one redundant size check.

Change-Id: Ie2381fa4ecd5264f2dd3ec3b0350df40376d0e34
Merge "Remove duplication in disk checks"