Fix a bad merge that brought back com_github_google_protobuf.
Fix a bad merge that brought back com_github_google_protobuf.

google/gapid,google/gapid,Qining/gapid,google/gapid,pmuetschard/gapid,pmuetschard/gapid,Qining/gapid,Qining/gapid,google/agi,google/agi,pmuetschard/gapid,Qining/gapid,google/agi,pmuetschard/gapid,pmuetschard/gapid,google/gapid,google/gapid,google/agi,Qining/gapid,Qining/gapid,pmuetschard/gapid,google/agi,google/agi,google/gapid,pmuetschard/gapid,Qining/gapid,google/gapid,pmuetschard/gapid,google/agi,google/agi,Qining/gapid,google/gapid