Revert "Revert "Switch keystore to binder""

This reverts commit 64576af98963f1c4d425e3213898d59481a4717e.