Merge "Preserve parameters to getProcAddress functions" into nyc-dev
am: accafc69f5

* commit 'accafc69f50aeeb57615e14ff0b787ea322a0627':
  Preserve parameters to getProcAddress functions

Change-Id: I7a7cbf4bcdef8d11cac0269600ff1e59076b26fe