Merge "Fix includes; use IBase instead of IBinder." am: bd5dc9df53
am: a7a0658efb

Change-Id: Ib4bfc9615322d30bdb7bb0aef9e245119f1f95e5