[automerger skipped] Fix JVMTI GetStackTrace bug
am: 3f0bfae2d1 -s ours
am skip reason: change_id I9f959569f90dbb75de0010173b119472a4b5864e with SHA1 342b69492c is in history

Change-Id: I1825cdf545c82e184b69bf9fe3a78b15abca944e