Merge "Have sync-tests send PID directly to runner." am: c7b2514d47
am: 2c402d7f8c

Change-Id: I2af158853a5adf812e2bef2efaef1f121a7d778b