am af38d896: Merge "ART: Use enums in Trace"

* commit 'af38d89634edbef394b3ef2cb3390d08dfb8d939':
  ART: Use enums in Trace