Fix import command
Merge branch 'gflags' into gflags2