Revert "keystore: Fix build with gcc 4.7+ -Werror"

This reverts commit f78d2a58016afad213b254e8c38b5af8f5bfd153.