Merge change I99d847cf

* changes:
  Add back missing shared library used by executable in link command.  Currently this library is linked via dependency of another library.  While that works, it is not the right thing to do.