Merge "Increase kDumpWaitTimeout 10x for target builds"
am: 35e0cbce51

* commit '35e0cbce516db91aaa77bfc39f797d9848a091c0':
  Increase kDumpWaitTimeout 10x for target builds