Merge "ART: Fix headers"