am 0627ae9a: am 8969a34a: Merge "Fix generic jni issue in ArtMethod::GetQuickFrameInfo"

* commit '0627ae9a5d56a2d6d058aa1db9174d3299e6034f':
  Fix generic jni issue in ArtMethod::GetQuickFrameInfo