Merge "Revert "Compute PPID at ninja time""
am: 3601e4a5c5

Change-Id: Ifb341ffc0ee82d95bff904367baac78f0e23ebc0