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

* commit 'ac157b0b4bbdb94c39825223283304dde2496b3a':
  Trim arena maps during heap trim