Merge "ART: Refactor static include list"