Merge "build_image: add padding to match partition size" am: ef5751c1ec
am: 5875285ecf

Change-Id: I6b5e882c7a980d43aad310ed925061da6d3a4c4a