restore custom bootimage handling

Change-Id: Ia6caaee95ab47f6297b082cbbd869c57bd1bb672