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

* commit 'df697c4db5599ec7893bc740bf661eeab888be6b':