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

Change-Id: I916db5f7fa200f74c43c8e76c3f48c5c5ac131f5