Merge "ART: Clean up after HInstruction::Is##type() rewrite."