Merge "Update uiautomator references in base/apct-tests/perftests/blobstore"