Merge changes I774a0711,I0b4fd670,Ia09935e5
authorJohann Koenig <johannkoenig@google.com>
Mon, 5 Nov 2018 23:32:11 +0000 (23:32 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 5 Nov 2018 23:32:11 +0000 (23:32 +0000)
commit4a6d4ec33e25f9daaeff0cc09e2b4c00cb701b74
treed352da655bd6388766ffc227f5c21898dbab80e5
parent921863210e2a0409da3e2b2a5d6003d91631dde2
parent191d3ada08df097adbd516ec18b8621d1893ea0f
Merge changes I774a0711,I0b4fd670,Ia09935e5

* changes:
  Fix compilation on OS/2
  Use wcslen() instead of std::wcslen()
  Fix compilation on OS/2