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

Change-Id: Ib618e6f67bc6ee52633e2de9df24e7698327a97e