Merge "DexPathList.Element.toString(): Fix unintended behavior change."