Revert "Fix build after Parcel ABI fix in Binder"

This reverts commit 8bd89ba7a84221baf3539fa8054e199d5ce883f8.
Revert "Revert "Fix build after Parcel ABI fix in Binder""

This reverts commit d2c6b34b3c1c73586067262b84aa462e6ee2f6b9.