am 59ede656: am df697c4d: am b4918b9a: Build keystore in 32 bit on platforms that require it.

* commit '59ede65637d6180e73aa8590e5d6454de8936c77':