Merge "libbinder: auto-choose between binder/vndbinder." am: fc7f6f0a86
am: 51c5b3d152

Change-Id: Ifcc32c86389d735d48f1e64312233d3237edfde3