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

* commit '7374c096878801f9c2c3a0d43443d33bf04225f3':
  Make libcore timeout the same for all runs.