Make Boost behave on Windows

Change-Id: I2d370552d41a726e8c47bebaa8a7ad50cb4a9273
Merge branch 'boost-windows'

Change-Id: I5326cb72b1084f31e1aae596f19b6132ebc6cc99