Add dir for #includes in glog_test
Merge remote-tracking branch 'chen3feng/master' into HEAD