Merge "Refactoring of UiAutomator to use the new UI test APIs."