Merge "Mark more win32 parameters as unused" am: b4d6b8ff8d
am: fe75fb7cef

Change-Id: I6aa72654e182910f40330b9336705d38746f6c17