am 2d999e05: Merge "Revert "ART: Split Checker into smaller files""

* commit '2d999e0588b008ec68a9fbda97dd32fd03c22364':
  Revert "ART: Split Checker into smaller files"