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

* commit '32630db19faf71d3a5663e5eea9cdb22d4507071':