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

Change-Id: I96e68b22c4173d22d96c0f67a0017ee269a240ab