Merge "Merge branch 'dalvik-dev'"