Merge "ART: Small compiler-driver cleanup"