Merge "Start refactoring MonkeyRunner to be a bit easier to understand."