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

Change-Id: I06cbf9ce1292a01dee854538c8db3d1d60fe9479