Merge changes Idcdfe515,I888be2bd

* changes:
  Revert "ART Test Runner"
  Revert "Fix issues in ART testrunner"