Validate that Handler being cleared is the one currently registered.

The BaseCommands.unsetOnXXX(Handler h) cleared the current singleton
registrant without validating that it was the same Handler used in the
argument. Out-of-order set/unset would cause a problem.

Bug: 17436226
Change-Id: I53a264e517f7cbef9e243c628102817a376da29d