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

* commit '1f6942459cb346be9179ae553b98c200adb1ab45':
  ART: Move trace options to a struct