Implement boot image extension relocation. am: c0b30c9cd2
am: 45f2f8fc20

Change-Id: I9d9413bd6672d411e5851f627d993871ee1ef226