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

* commit '8d19a756a9c75a538407b23ae10e36b9d619261b':
  Revert "ART: Split Checker into smaller files"