Merge "libbinder: consistent user{,debug} symbols"