Merge "Revert^2 "ART: Refactor typedef to using""
am: fc4b2eaa42

Change-Id: I705e45eb6990d988d8df30f3b77e35e8c004eb1c