Merge \\"Stack: Fix libmemunreachable stack test\\" am: 990ecb6773
am: 76ec97ba73

Change-Id: If9e886a2cf5e36f592cd2c868c30c025a9d508d0