Merge "Clean up Win32 platform code" into nyc-dev
authorPyry Haulos <phaulos@google.com>
Tue, 22 Mar 2016 17:51:18 +0000 (17:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Mar 2016 17:51:18 +0000 (17:51 +0000)
am: 813470e

* commit '813470e16149d6209ce96dbcfa6f6f72e8b7a64d':
  Clean up Win32 platform code


Trivial merge