Merge branch 'dalvik-dev'