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

Change-Id: I6363c1f2ed8243292afc567b86e77f50d769522d