Merge from master

Change-Id: I0958c123291c4825727ec1945f7a0feead3c535d

diff --cc default.xml
index d65dab6,6590aad..504c61d
--- 1/default.xml
--- 2/default.xml
+++ b/default.xml
@@@ -17,9 -17,9 +17,9 @@@
    <project path="bootable/diskinstaller" name="platform/bootable/diskinstaller" />
    <project path="bootable/recovery" name="platform/bootable/recovery" />
    <project path="cts" name="platform/cts" />
 -  <project path="dalvik" name="platform/dalvik2" />
 +  <project path="dalvik" name="platform/dalvik" />
    <project path="development" name="platform/development" />
-   <project path="device/asus/grouper" name="device/asus/grouper" />
+   <project path="device/asus/grouper" name="device/asus/grouper" groups="device" />
    <project path="device/common" name="device/common" />
    <project path="device/generic/armv7-a-neon" name="device/generic/armv7-a-neon" />
    <project path="device/generic/armv7-a" name="device/generic/armv7-a" />