Merge "More exception cleanup." into dalvik-dev