Revert "Boot image extension."
am: 9f459c4ef6

Change-Id: Ie5942ba508c7a5af6919a047230fd44709085214