Merge "Fix generic jni issue in ArtMethod::GetQuickFrameInfo"