am 32a67404: Merge "ART: Fix reg_type_test"

* commit '32a67404baa40664e9ace8eac81be0f4704413a5':
  ART: Fix reg_type_test