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

Change-Id: Ib433b5d41660ff84fb3f85b2fc7c2f064a553459