am 67b7a3a3: Merge "Remove .so from the windows build-tools." into jb-mr2-dev

* commit '67b7a3a3fc47db88c901bde9ca3c49e6ae7055bc':
  Remove .so from the windows build-tools.