Merge "Make memunreachable_test more robust against false negative leaks" am: 32fcdf8de2 am: 35c36f32de
am: 2993c701cc

Change-Id: I424d583026651e2c734fcd4de7571d1015db2b69