Merge "Revert "ART: Refactor typedef to using""