Fixes #4118: Move r29571 to 1.7

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

r29571 [[BR]]
Fix common ugni Makefile.am for non-DSO builds.