Merge "ART: Refactor ImageSpace loading"
am: b23e3b2156

Change-Id: I38e37a7f88ffc79705fe4acc6e6a27ec48e48a38