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

Change-Id: Ia06afb7351d15b6726bd92cdbe92fca8b5116da3