Merge "Fix merging HLoadClass with HNewInstance."