Merge "DO NOT MERGE: build_image: add padding to match partition size" into cw-f-dev