Revert "Boot image extension." am: 9f459c4ef6
am: 489cd0047e

Change-Id: I016cc1cecad74ba930169acf171aba9a8952dddc