Merge "build_image: add padding to match partition size"