Handle boot images with custom makefile properly

When a pre-built image should be used, it should be stored in the
target files zip so that it can be used with external signing
processes.

Change-Id: I41d7ab64cab48f31bf526ecfb19127a9ad15adea