Merge "ARM WinCE VS8 build update"