Update master manifest to match jb-mr1.1-dev

Change-Id: I9738fb170cb5c4be9b5a7a691fe2b28615063eda

diff --cc default.xml
index 7f5b266,0c5afd9..b4be1e7
--- 1/default.xml
--- 2/default.xml
+++ b/default.xml
@@@ -17,10 -17,8 +17,8 @@@
    <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
    <project path="bootable/recovery" name="platform/bootable/recovery" groups="pdk" />
    <project path="cts" name="platform/cts" />
 -  <project path="dalvik" name="platform/dalvik" />
 +  <project path="dalvik" name="platform/dalvik2" />
    <project path="development" name="platform/development" />
-   <project path="device/asus/grouper" name="device/asus/grouper" groups="device,grouper" />
-   <project path="device/asus/tilapia" name="device/asus/tilapia" groups="device,grouper" />
    <project path="device/common" name="device/common" />
    <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" groups="pdk" />
    <project path="device/generic/armv7-a" name="device/generic/armv7-a" groups="pdk" />
@@@ -130,6 -118,6 +118,7 @@@
    <project path="external/libselinux" name="platform/external/libselinux" />
    <project path="external/libsepol" name="platform/external/libsepol" />
    <project path="external/libusb" name="platform/external/libusb" />
++  <project path="external/libusb_aah" name="platform/external/libusb_aah" />
    <project path="external/libusb-compat" name="platform/external/libusb-compat" />
    <project path="external/libvorbis" name="platform/external/libvorbis" />
    <project path="external/libvpx" name="platform/external/libvpx" groups="pdk" />
@@@ -226,34 -211,12 +215,13 @@@
    <project path="frameworks/rs" name="platform/frameworks/rs" groups="pdk" />
    <project path="frameworks/support" name="platform/frameworks/support" />
    <project path="frameworks/testing" name="platform/frameworks/testing" />
 +  <project path="frameworks/volley" name="platform/frameworks/volley" />
    <project path="frameworks/wilhelm" name="platform/frameworks/wilhelm" />
    <project path="gdk" name="platform/gdk" />
-   <project path="hardware/akm" name="platform/hardware/akm" />
-   <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" groups="broadcom_wlan" />
-   <project path="hardware/invensense" name="platform/hardware/invensense" groups="invensense" />
    <project path="hardware/libhardware" name="platform/hardware/libhardware" groups="pdk" />
    <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" groups="pdk" />
-   <project path="hardware/msm7k" name="platform/hardware/msm7k" />
-   <project path="hardware/qcom/audio" name="platform/hardware/qcom/audio" groups="qcom" />
-   <project path="hardware/qcom/bt" name="platform/hardware/qcom/bt" groups="qcom" />
-   <project path="hardware/qcom/camera" name="platform/hardware/qcom/camera" groups="qcom" />
-   <project path="hardware/qcom/display" name="platform/hardware/qcom/display" groups="qcom" />
-   <project path="hardware/qcom/gps" name="platform/hardware/qcom/gps" groups="qcom" />
-   <project path="hardware/qcom/keymaster" name="platform/hardware/qcom/keymaster" groups="qcom" />
-   <project path="hardware/qcom/media" name="platform/hardware/qcom/media" groups="qcom" />
-   <project path="hardware/qcom/msm8960" name="platform/hardware/qcom/msm8960" groups="qcom" />
-   <project path="hardware/qcom/power" name="platform/hardware/qcom/power" groups="qcom" />
-   <project path="hardware/qcom/sensors" name="platform/hardware/qcom/sensors" groups="qcom" />
-   <project path="hardware/qcom/wlan" name="platform/hardware/qcom/wlan" groups="qcom_wlan" />
    <project path="hardware/ril" name="platform/hardware/ril" groups="pdk" />
-   <project path="hardware/samsung_slsi/exynos5" name="platform/hardware/samsung_slsi/exynos5" groups="exynos5" />
-   <project path="hardware/ti/omap3" name="platform/hardware/ti/omap3" />
-   <project path="hardware/ti/omap4-aah" name="platform/hardware/ti/omap4-aah" groups="omap4-aah" />
-   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" groups="omap4" />
-   <project path="hardware/ti/wlan" name="platform/hardware/ti/wlan" />
-   <project path="hardware/ti/wpan" name="platform/hardware/ti/wpan" />
 -  <project path="libcore" name="platform/libcore" />
 +  <project path="libcore" name="platform/libcore2" />
    <project path="libnativehelper" name="platform/libnativehelper" groups="pdk-java" />
    <project path="ndk" name="platform/ndk" />
    <project path="packages/apps/BasicSmsReceiver" name="platform/packages/apps/BasicSmsReceiver" />