Merge "Add -static-libgcc to mksdcard on Windows" am: 21b5f6fef1
am: 7fabb508f9

Change-Id: Ic7f610c5f06bf4127b362af3d5f73a91a4f8c812