am 6698ba3d: am 840bc269: Merge "Add -static to static link command, for clang."

* commit '6698ba3d6c9efebac63c224a1fb985f0a53a501a':
  Add -static to static link command, for clang.