Merge "Fix SimplifyIfs() trying to redirect exception handler edges."
am: b02b8d7df4

Change-Id: I4a765402b6c68e3f8703f9937d7bd1e198a1e715