Fix minor merge issue with Jing's patch for handling failure to find
protobuf.