Merge "Clean up handrolled Binder proxies. Bug: 5332296"