Merge "Be compatible with new google test"