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

Change-Id: Ie4c290e754b7ecae0834fdce9390d230118f73fe