Merge "Use IBinder to identify callbacks in VHAL" into oc-dev am: 2e25e562fa
am: 84163bc36f

Change-Id: Ifa921d812d63f2833e015201e8a1d111383b10ef