Merge from master

Change-Id: I56afc6c9637ed88b1d35b50e94ad16e4a571b7de
diff --git a/default.xml b/default.xml
index c9eb8e4..e3f946e 100644
--- a/default.xml
+++ b/default.xml
@@ -356,7 +356,8 @@
   <project path="system/netd" name="platform/system/netd" />
   <project path="system/security" name="platform/system/security" />
   <project path="system/vold" name="platform/system/vold" />
-  <project path="tools/build" name="platform/tools/build" groups="toolsbuild" />
+  <project path="tools/base" name="platform/tools/base" groups="notdefault,tools" />
+  <project path="tools/build" name="platform/tools/build" groups="notdefault,tools,toolsbuild" />
   <project path="tools/motodev" name="platform/tools/motodev" />
 
 </manifest>