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

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