Merge "Remove ResolveUtil from frameworks/base callers"