Merge "ART: Fixing build breakage."