Merge "Move to new isolation test runner."
am: 4755a06956

Change-Id: Iea4286be6e623807c72b715030cf24a02f1017ed