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

Change-Id: I8c9b52fd9c25db639b36709bbfc95dc4470e56bd