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

* commit '7b6a8a334449bdfa8468ca7cdfd6be18bc147946':
  Trim arena maps during heap trim