Merge "DexMerger: Workaround for buffer overflow in tests"
am: f823242464

Change-Id: Ib1672812c99c51ddf979ac42770cb1215cc71719