Merge "ART: Fix tidy warning in compiler-driver"