Merge "libbinder: eliminate Binder.cpp dependency on IShellCallback"