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

Change-Id: I7d611c81e6f4a16d857b67e10df502f103609053