merge from open-source master

Change-Id: Idf8c8890a251c77b131fed6019428501a41fd788
diff --git a/core/main.mk b/core/main.mk
index 2f6b297..c08d41a 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