Merge "Fix FD comparisons in binder" am: 1a9db5066b am: f18ddef416 am: f09b6060ad am: d844863aca
am: 3e1b23b387

Change-Id: I31c4b88ca3e4ef3cf3a2cbbb6133f658c31712e5