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

* commit '481042fc02a0afc91f11708887fb39a53add8ee6':
  Build keystore in 32 bit on platforms that require it.
tree: 10d2fae2245e3aef8136513f8b6f4e12cd8664d6
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/