Update to various files to support scons build mgmt tools.