GC-independent image layout.
am: 31c3daa15d

Change-Id: I35a89091217485389826c473a9b84ce93709b5df