Bug 928091 - Fix builds for VS2012 and VS2013 to deal with our char16_t machinery; pending r=Waldo

Landing on a CLOSED TREE because this is blocking multiple people.  My apologies!
Automatic merge