Revert "Refactor image loading."

This reverts commit 3934736709a38f312d9c04707e4f8bb7ca73cb22.

Reason for revert: Breaks image_space_test on target.

Bug: 112827048
Change-Id: Ia3b2e93c2d075a4cd7093df4e1674cadb83ce560
3 files changed