am 1968f286: am b12cce10: Merge "Refine module name resolving in multilib build"

* commit '1968f286d69c36692bd5788fa8745ed16ccc03cb':
  Refine module name resolving in multilib build