Merge "Fix handling of _ZLXX."