Merge "Remove unused java packages"
diff --git a/default.xml b/default.xml
index 142f226..3b3b55c 100644
--- a/default.xml
+++ b/default.xml
@@ -175,19 +175,27 @@
   <project path="system/webservd" name="platform/system/webservd" groups="bdk" />
 
   <!-- BEGIN starter boards -->
+  <!-- Intel SoCs and Peripherals -->
+  <project path="hardware/bsp/intel"
+           name="platform/hardware/bsp/intel"
+           groups="edison,minnowboard" />
   <!-- Intel Edison -->
   <project path="device/intel/edison"
            name="device/intel/edison"
            groups="edison" />
-  <project path="hardware/bsp/intel"
-           name="platform/hardware/bsp/intel"
-           groups="edison" />
   <project path="hardware/bsp/kernel/intel/edison-3.10"
            name="platform/hardware/bsp/kernel/intel/edison-v3.10"
            groups="edison" />
   <project path="hardware/broadcom/libbt"
            name="platform/hardware/broadcom/libbt"
            groups="edison" />
+  <!-- Intel MinnowBoard -->
+  <project path="device/intel/minnowboard"
+           name="device/intel/minnowboard"
+           groups="minnowboard" />
+  <project path="hardware/bsp/kernel/intel/minnowboard-3.14"
+           name="platform/hardware/bsp/kernel/intel/minnowboard-v3.14"
+           groups="minnowboard" />
   <!-- Qualcomm Dragonboard -->
   <project path="device/qcom/dragonboard"
            name="device/qcom/dragonboard"
@@ -196,8 +204,7 @@
            name="platform/hardware/bsp/qcom"
            groups="dragonboard" />
   <project path="hardware/bsp/kernel/qcom/qcom-msm-3.10"
-           name="platform/hardware/bsp/kernel/qcom"
-           revision="qcom-msm-3.10"
+           name="platform/hardware/bsp/kernel/qcom/qcom-msm-v3.10"
            groups="dragonboard" />
   <!-- Marvell Abox -->
   <project path="device/marvell/abox_edge"
@@ -207,8 +214,27 @@
            name="platform/hardware/bsp/marvell"
            groups="abox" />
   <project path="hardware/bsp/kernel/marvell/pxa-3.14"
-           name="platform/hardware/bsp/kernel/marvell"
-           revision="pxa-3.14"
+           name="platform/hardware/bsp/kernel/marvell/pxa-v3.14"
            groups="abox" />
+  <!-- Rockchip Kylin -->
+  <project path="device/rockchip/kylin"
+           name="device/rockchip/kylin"
+           groups="kylin" />
+  <project path="hardware/bsp/rockchip"
+           name="platform/hardware/bsp/rockchip"
+           groups="kylin" />
+  <project path="hardware/bsp/kernel/rockchip/rk4.1"
+           name="platform/hardware/bsp/kernel/rockchip"
+           groups="kylin" />
+  <!-- Freescale Picoimx -->
+  <project path="device/freescale/picoimx"
+           name="device/freescale/picoimx"
+           groups="picoimx" />
+  <project path="hardware/bsp/freescale"
+           name="platform/hardware/bsp/freescale"
+           groups="picoimx" />
+  <project path="hardware/bsp/kernel/freescale/picoimx-3.14"
+           name="platform/hardware/bsp/kernel/freescale"
+           groups="picoimx" />
   <!-- END starter boards -->
 </manifest>