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

Change-Id: Ib42968eae19782fce7be35cb8f6f452c04908c44