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

Change-Id: I788b7649b7255814ab720ca1fe645c37d431a0d1