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

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