Merge "Add a 32-bit x86_64 arch variant"
am: 19b7692496

* commit '19b76924969de45f77334a5e7d86b22362a8d845':
  Add a 32-bit x86_64 arch variant

Change-Id: Ia2d708a0d2159d39cafbbf9589e2c4d296e3ffb1