am 28c2d3b9: Merge "Fix breakage for x86_64 static executables."

* commit '28c2d3b9852550bc9ae150e2725e08885f1ade73':
  Fix breakage for x86_64 static executables.