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

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