Fix vtable relocation for boot image extension. am: 0ac78cf94f
am: 5cca768b9f

Change-Id: I8c5e5ff43e0d64876d382bdb01414ae7e2d970a0