Merge "Make exception logging a little prettier." into dalvik-dev