bring back boot.img handling

Change-Id: I84050a17a216e87b9d58fd4afe32458e00a7f462