Merge "libbinder: auto-choose between binder/vndbinder."