Merge "Increase kDumpWaitTimeout 10x for target builds" into nyc-dev
am: 4eddb40ff0

* commit '4eddb40ff05b94e5d788b7c5956472be8a22f9ea':
  Increase kDumpWaitTimeout 10x for target builds