am: 564289c7 -s ours * commit '564289c7': Fix relocate in place to handle arbitrary app image layout Change-Id: If99e268e3d49529495dfeb6a8e6c37b646e8d9d6