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

* commit '78395472dd01b9a6f285bf5595657cd78851affa':
  Fix relocate in place to handle arbitrary app image layout

Change-Id: Ib0c6f65971a91db311a7d860446729287d617ac0