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

Change-Id: I3acaf9f2ac61fd325c35e9845fb0bd1251bca6c0