Merge "heap: Tolerate rosalloc allocation races in the heap visitor" am: daaec1079b
am: ff3334e830

Change-Id: Ica7a9f0beae6e195f6788f40c763d915ebf86d57