Merge "Fix / suppress new unused warnings for mingw+clang" am: f106bb6bb8
am: 829ecaa808

Change-Id: I333c6fc664daaa713a81b16cd98a33db676a0e30