Merge "Tweaks for googlemock."