am 0de01fe0: am c282c119: Merge "Fix gcstress tests."

* commit '0de01fe00dcaeaea2dddbf50c8c382510e7d08bf':
  Fix gcstress tests.