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

Change-Id: I13bf64e4979c37fde8d903540c69deb028a97cbd