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

* commit 'fbae0fd1a69b4bab0d5cc123e4227a42c8dd0718':
  Preserve parameters to getProcAddress functions

Change-Id: Ib16d206a91fbd7b282b96afd20ff414948a99ed5