Fix Android build#2207

glbrntt merged 2 commits intogrpc:maingrpc/grpc-swift:mainfrom

swift-everywhere:mainswift-everywhere/grpc-swift:mainCopy head branch name to clipboard