Merge "Fix some exception issues" into dalvik-dev