am 3c37c63a: merge from open-source master

Merge commit '3c37c63a83ff178334b855747ecda4c1f24c38ca'

* commit '3c37c63a83ff178334b855747ecda4c1f24c38ca':
  Fix to "make ddmlib ddmuilib" under Windows/Cygwin.
diff --git a/core/main.mk b/core/main.mk
index f1a9beb..8dcfdb8 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -408,6 +408,7 @@
 	sdk/sdkstats \
 	sdk/sdkmanager \
 	sdk/layoutopt \
+	sdk/ddms \
 	development/apps \
 	development/tools/mkstubs \
 	packages