Merge "Refine module name resolving in multilib build"