Change Boost layout to "tagged" on Windows

Change-Id: I362add0702ff73adb3daf5d1501f08cd101b01ca
Merge topic 'boost-layout-fix' into master

040d4d2b Change Boost layout to "tagged" on Windows