Merge "ART: Fix dependencies"