Merge "Fix handling of _ZLXX." am: 9b537f24bd am: a11394356c am: 930e0c3ad4
am: 1109ce9b9f

Change-Id: I5eb6cafb02128a75152cc7dcfe818f90a43b0a4f