am 3c37c63a: merge from open-source master

Merge commit '3c37c63a83ff178334b855747ecda4c1f24c38ca'

* commit '3c37c63a83ff178334b855747ecda4c1f24c38ca':
  Fix to "make ddmlib ddmuilib" under Windows/Cygwin.