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

* commit 'ec28a489e8d4fe7ddc35bee1f16e08bebd202dac':
  Fix breakage for x86_64 static executables.