Merge "Suppress warnings/errors for clang+mingw" am: d8d3ba7dda
am: c010544766

Change-Id: Ie77958b71b800b232411aa4a20f890b099e82d5f