Merge changes I1ce1c9b6,Ifd2db5bf

* changes:
  ART: Clean up timeout_dumper
  ART: Refactor ptrace timeout code for timeout_dumper