Fixes #4223: Move r30555 to v1.7 branch (Fix wrapper ldflags.)

---svn-pre-commit-ignore-below---

r30555 [[BR]]
Fix wrapper ldflags.

cmr=v1.7.4:reviewer=jsquyres