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

Change-Id: I7d4291ca024ad7438fc42b9e0ea0034ef2e0f55c