Merge "Enable libcompiler_rt on Windows" am: fc52259cf2 am: ebb09acfe2
am: 06ab02a3d9

Change-Id: Iaf9591ea2a0f292f3bb5e507aeccbdfc68c7e30e