Merge "Fix rosalloc issues with valgrind."
am: ad736f19b4

* commit 'ad736f19b4ab0b1767fba9ed124f12e74313fcbb':
  Fix rosalloc issues with valgrind.