Use IBinder to uniquely identify binder callbacks. am: b7f7380688
am: 7be9ec2547

Change-Id: I0b26a0a0b7d41ce7cf170f8b8893cf63dbee955e