Merge "Use mutator lock to guard adding and removing heap spaces"
am: 6a507f3bef

* commit '6a507f3bef2c970b29bada165269d2764d260fc8':
  Use mutator lock to guard adding and removing heap spaces