am 63878212: Merge "Make libcore timeout the same for all runs."

* commit '6387821209a03c5d873cf9dc6fd11434918bbdf4':
  Make libcore timeout the same for all runs.