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

Change-Id: I5974ceb60518f5e32cf5262bfac51d1737aa76ff