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

* commit '8969a34a46e8b97476c7cd58a3ab28be18d3f7eb':
  Fix generic jni issue in ArtMethod::GetQuickFrameInfo