reverting gflags 2.1.1

If I've screwed up ``` gflags ```/ ``` glog ``` as much as #34528 makes it look like, here's a bunch of reverts to deal with it.