Merge "DumpStringOutput: Rename getOutput() to __toString()"