am a68a7cf8: Merge "ART: Move trace options to a struct"

* commit 'a68a7cf8f3a6fef22d71a14350176115cb13857f':
  ART: Move trace options to a struct