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

Change-Id: I0e565f2858dc47ba27ac105c11c184e8ace2d9b2