am 4a16cd72: Merge "Build keystore in 32 bit on platforms that require it."

* commit '4a16cd72102c5b0aeb2690edb5aac1c4d0e1b7fa':
  Build keystore in 32 bit on platforms that require it.