Merge "Do not use --exclude-libs linker flag for Windows" am: a3cec0985a
am: 0526409654

Change-Id: I3c34c73f5c7008c01a2d7b19b1c6de7f5e035b6f