Merge changes I504837ef,I1e69927e

* changes:
  Fix StackWalker.VerifyStackTrace test
  Add test for StackFrameInfo.getByteCodeIndex()