Merge "The failure of dx test 105 wasn't actually spurious. Fixed the code." into dalvik-dev