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

* commit '5e0cfd484a03957513ce35506d20575e3cba3493':

Change-Id: Ia32485a279474c61bd72cfc9c38b99ac93b0a942