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

Change-Id: I54e43cc6460835d4267eced627f88856cd41f42d