Make android buildable under bazel#12808

jdcormie wants to merge 3 commits into

grpc:mastergrpc/grpc-java:masterfrom

jdcormie:intent-name-resolver-testjdcormie/grpc-java:intent-name-resolver-testCopy head branch name to clipboard