Merge "Build keystore in 32 bit on platforms that require it."
tree: 93e0eaeb00c21ace7c49f3800df8e1b3ce199cda
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/