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

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