am 598f4b3a: Merge "Fix getpid caching across a clone."

* commit '598f4b3ac1be3c6ef3af613ac4b0694841e165fe':
  Fix getpid caching across a clone.