am 6b468193: am cc2a47bf: Merge "Check existence of both 64-bit and 32-bit module variants."

* commit '6b468193536c1925944ccbf6269ee057e080aef4':
  Check existence of both 64-bit and 32-bit module variants.