Merge "ART: Add correct -inl file"