Replace dumb reraise with reraise util.

Change-Id: I04a4a5a0366c95cb84711364d032972e9ff382a6
Merge "Replace dumb reraise with reraise util."