am bbacc2c3: Merge "Make gc-thrash able to handle OOME"

* commit 'bbacc2c3a0473b067b58524c58015be193af03cc':
  Make gc-thrash able to handle OOME