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

Change-Id: I69064a1a0eaeb4ab0450b5c824abc13657023e00