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

* commit '722d6d7193cc013c48e3e38b990f9515b7e92a0e':
  Preserve parameters to getProcAddress functions

Change-Id: I7da8b13869e5cc87c57665f5527516e58e53e14b