Merge "Unify resource merger error messages." into studio-1.3-dev