Merge "Improve string layout in dexlayout." am: c5e4a53252 am: d10b6c3354
am: edd9e55164

Change-Id: I52bf702f32d6de4ea73f6a0bb1fbb4fa76a7e83b