Merge "DO NOT MERGE: build_image: add padding to match partition size" into cw-f-dev am: 28b96d1470 am: 0668a16cba
am: 8c44b567fe  -s ours

Change-Id: I196248b1464f951a9352137ef78a287da6dd3abe