Revert "Switch keystore to binder"

This fixes the Security settings FC
This revert is due to mussing stuff from other projects

This reverts commit a327323baa692dd8609ab66176785334fbb2d127.

Change-Id: Ied444d467fce319762e0dd4980545afd19ee7d6a
Merge "Revert "Switch keystore to binder"" into jb4.2