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

Change-Id: Ifad04fe3804826f97f1c228e666bb6760aa19f5f