Merge "binder: Return pid_t/uid_t instead of int"