Merge "ART: Remove stale cutils includes"