Refactor image relocation

Refactor image relocation to enable having the objects be at a
different location than the rest of the image.

Bug: 116874661
Test: test-art-host
Change-Id: I48e46b9643362ecb32cb480fa1cfd4ac1fa20875
2 files changed