Fix Binder warnings after C++ bump to 20

Bug: 311052584
Test: mma in binder folder
Change-Id: I716613dbdbf4b58b128106b893d051995bcc9d4a
2 files changed