Merge "Fix memory leaks in DexString wrapper and in unit tests." am: 3319162e6b
am: 4cc45e90c3

Change-Id: I99f123e213ca2dd3a720eec43964513a0f6d75ef