Fixes some compilation bugs in the upstream AGDK glue code: https://issuetracker.google.com/issues/229997306