Merge "[HostStubGen] Support non-static methods..." into main