Merge "Fix a compiler bug related to a catch-less try-finally statement."