Merge "Fix StackWalk test."
am: 83d0447277

Change-Id: I8ed93dfa4e22077431628bf333034bf8c28b7d29