Fix tests for using IBase instead of IBinder. am: 1d747311b3
am: 77d0a60f1a

Change-Id: I8c5b72e5dd9059554e9fe766115b1aee929e9d22