merging, cleaning up
merging, cleaning up

google/googletest,jlanecox/googletest,antidotcb/googletest,google/googletest,google/googletest,jlanecox/googletest,gianricardo/googletest,gianricardo/googletest,xnagireddy/googletest,antidotcb/googletest,jlanecox/googletest,fuchsia-mirror/third_party-googletest,jlanecox/googletest,antidotcb/googletest,empiredan/googletest,gianricardo/googletest,fuchsia-mirror/third_party-googletest,empiredan/googletest,google/googletest,xnagireddy/googletest,fuchsia-mirror/third_party-googletest,xnagireddy/googletest,fuchsia-mirror/third_party-googletest,antidotcb/googletest,xnagireddy/googletest,empiredan/googletest