Merge "Clean up Win32 platform code" into nyc-dev
authorPyry Haulos <phaulos@google.com>
Tue, 22 Mar 2016 17:36:34 +0000 (17:36 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 22 Mar 2016 17:36:34 +0000 (17:36 +0000)

Trivial merge