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

Change-Id: I57b37702b9138714a474b1e2a3d1e32bed4e6eec