Fix relocate in place to handle arbitrary app image layout
am: 564289c  -s ours

* commit '564289c753cbe3521f9523b350bd713c1fe2fbd4':
  Fix relocate in place to handle arbitrary app image layout

Change-Id: If99e268e3d49529495dfeb6a8e6c37b646e8d9d6