Fixed bugs associated with pulling from master.

Generating collect libsight_layout.so