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

* commit 'c3383389813146ce18e9cc4cb6a1c13b7c72d4cb':
tree: 694cfb89258d1da48c68092ae1c65d0052646fe4
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/