Merge "Remove .so from the windows build-tools." into jb-mr2-dev