Merge "Remove AndroidKeyStore from API" into jb-mr1-dev