Fix tr &  win32-msvc build

Change-Id: I491a7e1121e07c03554d5715671d00db3c35392d