Add missing wchar file and fix sorting of build files

Change-Id: Ibbbfbbffa23d6423dd6d6df78a308fd2b78ec986