Merge "add uiautomator into system image" into jb-dev