Merge "Remove ResolveUtil from frameworks/base callers" am: 0e1621296f
am: 0bd9ac4b69

Change-Id: I3199337fd168f58f13a547d4eaff2be069a22f3d