Merge "Revert "Optimize BpBinder struct size.""