Merge "ART: Fix a minor lint error"