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

* commit '2570d0ada876b94a91f9665c7469140ba0ddc712':
  keystore: remove old APIs

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base