Merge "ART: Fix linting errors"