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

Change-Id: I1f78e64f50985efae818b065f0351d0acaf80010