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

Change-Id: I349eadd8c67f52e32283150de565dd4cd9826cdc