Merge "Revert "Adds a few dependencies to the shared library."" into tm-qpr-dev