Merge changes I344d60df,Idf954e45 into main

* changes:
  [HostStubGen] Support method call redirection
  [HostStubGen] clean-up remapper support