Merge "Use IBase instead of IBinder."
am: 8d97847903

Change-Id: I2fc116385235e7ddf0d8ac5a4c2fe788f143b859