Merge changes Ifd33b241,Ic8678d14,Icb2542c3

* changes:
  ART: Add tidy errors
  ART: Fix tidy warnings in patchoat (again)
  ART: Fix tidy warnings in imgdiag