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

Change-Id: I51c3f668b1c71493bc2ec60e57de4d60c329c144