Merge "Suppress unused parameter warnings with clang+mingw" am: fc3ce59cce
am: 3cc48a9ecc

Change-Id: I38597fff76f2a0cc1b01c9daedec75384844bf19