Merge "The rest of the refactor to make MonkeyRunner cleaner."