Revert "Fix tests for using IBase instead of IBinder." am: 0dbb9903cd
am: 666a5dcafe

Change-Id: Ia1010cf130fc9b0103a4ce7c97c53dbf7a4cca36