Merge "Remove uses of deprecated GTest macro."