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

Change-Id: Ia9df8444dcb86298551052681e2f36785fd4570b