Merge "Increase kDumpWaitTimeout 10x for target builds" into nyc-dev