Merge "keystore: remove old APIs" into jb-mr2-dev