Revert "Add casts to avoid build warnings with gcc-4.7"

This reverts commit b022a4ece0f15ad4156021a8997a434146f7dace.
keystore: Fix build with gcc 4.7+ -Werror

Fix code fragments that are errors in ISO C++11 mode,
and cause warnings in gcc 4.7+ -Werror (narrowing
conversions inside {})

Change-Id: I878687e1daf99efddc353040805947e26435e535
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>