am d68cda47: An attempt to unregister a handler that\'s no longer registered...

am d68cda47: An attempt to unregister a handler that\'s no longer registered should not cause an assertion.

Merge commit 'd68cda472a3646966a203338ccac04f0783293b7' into gingerbread-plus-aosp

* commit 'd68cda472a3646966a203338ccac04f0783293b7':
  An attempt to unregister a handler that's no longer registered should not cause an assertion.