Fix boot image extension relocation. am: beb66b38dc
am: 454e7e7850

Change-Id: If45c6bc3ae199e0c687a302f71af14ee998af3bb