Merge "Fix dalvik test 089" into dalvik-dev