Split multicatch so they have different handlers.

This is a workaround for bug 14256107. See bug 14499218 for more discussion
about the motivations for this change.

(cherry picked from commit 38f3f7c42f4d71e80f98e6bb7b45072fe6b884fa)

Change-Id: Ia99b8ba64217f712c72bf9ffb6a5396409639550
1 file changed