Merge "Use IBase instead of IBinder for IServiceManager."