GC-independent image layout. am: 31c3daa15d am: d85f956d96
am: 46065e189b

Change-Id: Ie58fb671156979b4bf73d6da8fc39ae2e2e132ea