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

Change-Id: I77904a099bd327387670fb3480c4f96dab743312