Merge "ART: Rewrite ThreadStress for easier extensibility"