Merge "Trim arena maps during heap trim" am: ac157b0b4b
am: 3102a7b883

* commit '3102a7b8834ac4d6353401ed9515b4ac9dc4d225':
  Trim arena maps during heap trim