Merge change I4bf8618f

* changes:
  Add back missing shared libraries used by executable in link command.  These libraries are linked though dependencies of other libraries.  While that works, it is not the right thing to do.