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

* commit '1411afd6d18ee363b96c8e4b20561d5e946abfbf':
  Fix getpid caching across a clone.