am 6561551f: Merge "Move arenas into runtime"

* commit '6561551f094f79ce569160b29131b07be7aa3363':
  Move arenas into runtime