Mechanical code clean-ups in MSG_UNBIND handler.

As a preparation to fix Bug 25373872, this CL does a mechanical
code clean-ups.  Literally there is no behavior change.

Bug: 24504456
Change-Id: I6e3062bda17e748a3c5f1450d6752239dd260520
1 file changed