Merge "Clear exception if catch block doesn't have move-exception." into dalvik-dev