Merge "ART: Fix reg_type_test"