Change TSK build dependencies

Still not entirely satisfactory, but the dependencies are tracked
better this way.
Update TSK commit