Merge "Fix or silence binder build warnings on clang" into main