am f11cc96e: Merge change 26793 into eclair

Merge commit 'f11cc96ee837f8b0d530f3a5dd78ffc358727411' into eclair-plus-aosp

* commit 'f11cc96ee837f8b0d530f3a5dd78ffc358727411':
  KeyStore: remove classes used by old keystore.