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)
* changes:
  Fix compilation on OS/2
  Use wcslen() instead of std::wcslen()
  Fix compilation on OS/2


Trivial merge