am 5899ad25: am b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists."

* commit '5899ad254d3b94653b88e5f0f41f54690f22bd24':
  Resolve :32 to 32-bit variant only if the variant exists.