Merge from master

Change-Id: I913f2fb5c4974685f2ebf34d3aa5afb9d8f82980

diff --cc default.xml
index 81ef5ca,01ba705..3e56b51
--- 1/default.xml
--- 2/default.xml
+++ b/default.xml
@@@ -17,9 -17,10 +17,10 @@@
    <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" groups="device" />
+   <project path="device/asus/tilapia" name="device/asus/tilapia" 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" />