Merge "Update uiautomator references in frameworks/base"