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

* commit '4b1042e765f98c1437363b30b310f9bf35c92dc1':
  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