Merge remote-tracking branch 'google/bugfix/#77-@GFLAGS_IS_A_DLL@-expands-to-empty' into develop