Merge commit '041a7f2cd62dcd59bed21b92f160e8f5237552dd' as 'third_party/gflags'

Change-Id: I55f95a699407fe7b0bbc90e6658b86070545b12d