Merge "Fix DCHECK in OatQuickMethodHeader::GetFrameSizeInBytes()"