am 9539beb2: Merge "Tweaks for googlemock."

* commit '9539beb282149fec80fd7150060b22ea7e379a3c':
  Tweaks for googlemock.