Merge "Improve string layout in dexlayout."