Fix minor issues in google-gflags 2.0-1