Merge "Fix breakage for x86_64 static executables."