am 199c461a: am e5f5953e: Merge "ART: Rewrite ThreadStress for easier extensibility"

* commit '199c461a81e6aa861a2b728497992d4898fd38e2':
  ART: Rewrite ThreadStress for easier extensibility