Merge "ART: Disable part of reg_type_test for CMS"
am: 28e535bd94

Change-Id: Ib3c22a4252ab203d562fec47ce5c2d5c82099ad6