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

Change-Id: I19aaab318b88fcb2289eaa7bc1fe636072c5bc39