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

Change-Id: Idea1923a89efe041635f09cd17535a2fb1f0b35b