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

Change-Id: I611d49f9cf129a6888b8e2ec3ca79f5e9d3f7c22