Merge "Make <clinit> verification stronger for v37+."