* Makefile.in (osconstool): Revert previous change, still needed
	after all. Add call to copy-s-oscons target.

From-SVN: r193240