Merge "ART: Fix tidy warning in patchoat"