Merge "Skip userdata.img if no size is provided when building images from target files"