am dfca0ee8: Merge change 8082 into donut
am dfca0ee8: Merge change 8082 into donut

Merge commit 'dfca0ee879a6cb14bcdabf34962dcec3b34a40b3'

* commit 'dfca0ee879a6cb14bcdabf34962dcec3b34a40b3':
  Cleanup the old keystore 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