Merge "ART: Build fix"