Merge "Emit some additional debug info for java.lang.String"