Merge "libbinder: fix trusty cpp fd transport modes" into main